2005-01-19 05:00:03

by Adrian Bunk

[permalink] [raw]
Subject: [2.6 patch] bttv: make some code static

This patch makes some bttv code static.

Signed-off-by: Adrian Bunk <[email protected]>

---

diffstat output:
drivers/media/video/bttv-cards.c | 5 +++--
drivers/media/video/bttv-driver.c | 6 +++---
drivers/media/video/bttvp.h | 5 -----
3 files changed, 6 insertions(+), 10 deletions(-)

This patch was already sent on:
- 9 Nov 2004

--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttvp.h.old 2004-11-07 16:34:44.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttvp.h 2004-11-07 16:47:42.000000000 +0100
@@ -240,11 +221,6 @@
extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
extern int init_bttv_i2c(struct bttv *btv);
extern int fini_bttv_i2c(struct bttv *btv);
-extern int pvr_boot(struct bttv *btv);
-
-extern int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg);
-extern void bttv_reinit_bt848(struct bttv *btv);
-extern void bttv_field_count(struct bttv *btv);

#define vprintk if (bttv_verbose) printk
#define dprintk if (bttv_debug >= 1) printk
--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-cards.c.old 2004-11-07 16:34:59.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-cards.c 2004-11-07 17:14:25.000000000 +0100
@@ -84,12 +84,13 @@
static int tea5757_write(struct bttv *btv, int value);
static void identify_by_eeprom(struct bttv *btv,
unsigned char eeprom_data[256]);
+static int __devinit pvr_boot(struct bttv *btv);

/* config variables */
static unsigned int triton1=0;
static unsigned int vsfx=0;
static unsigned int latency = UNSET;
-unsigned int no_overlay=-1;
+static unsigned int no_overlay=-1;

static unsigned int card[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
static unsigned int pll[BTTV_MAX] = { [ 0 ... (BTTV_MAX-1) ] = UNSET };
@@ -2979,7 +2959,7 @@

extern int mod_firmware_load(const char *fn, char **fp);

-int __devinit pvr_boot(struct bttv *btv)
+static int __devinit pvr_boot(struct bttv *btv)
{
u32 microlen;
u8 *micro;
--- linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-driver.c.old 2004-11-07 16:40:15.000000000 +0100
+++ linux-2.6.10-rc1-mm3-full/drivers/media/video/bttv-driver.c 2004-11-07 16:41:55.000000000 +0100
@@ -1071,7 +1071,7 @@
init_irqreg(btv);
}

-void bttv_reinit_bt848(struct bttv *btv)
+static void bttv_reinit_bt848(struct bttv *btv)
{
unsigned long flags;

@@ -1275,7 +1275,7 @@
btv->c.nr,outbits,data & outbits, data & ~outbits, comment);
}

-void bttv_field_count(struct bttv *btv)
+static void bttv_field_count(struct bttv *btv)
{
int need_count = 0;

@@ -1475,7 +1475,7 @@
"SMICROCODE", "GVBIFMT", "SVBIFMT" };
#define V4L1_IOCTLS ARRAY_SIZE(v4l1_ioctls)

-int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
+static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
{
switch (cmd) {
case BTTV_VERSION:


2005-01-19 09:50:45

by Gerd Knorr

[permalink] [raw]
Subject: Re: [2.6 patch] bttv: make some code static

> This patch was already sent on:
> - 9 Nov 2004

Damn, yes. I have it. I don't consider those patches *that* important
that I instantly forward the stuff, they'll go out with the next batch
of v4l updates because it's less work that way.

If you want to have a look at my latest (not submitted yet) stuff check
out the video4linux cvs snapshots (http://dl.bytesex.org/cvs-snapshots/)
or (less frequently updated) the kernel patches @
http://dl.bytesex.org/patches/.

Gerd

2005-01-19 10:12:57

by Adrian Bunk

[permalink] [raw]
Subject: Re: [2.6 patch] bttv: make some code static

On Wed, Jan 19, 2005 at 10:43:52AM +0100, Gerd Knorr wrote:
> > This patch was already sent on:
> > - 9 Nov 2004
>
> Damn, yes. I have it. I don't consider those patches *that* important
> that I instantly forward the stuff, they'll go out with the next batch
> of v4l updates because it's less work that way.
>...

This was not meant as an insult, and I agree it isn't urgent.

I noticed this patch wasn't yet merged and resent it. If you already
have it and plan to merge it simply ignomy my resending.

> Gerd

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-01-19 10:24:04

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [2.6 patch] bttv: make some code static

On Wed, Jan 19, 2005 at 10:43:52AM +0100, Gerd Knorr wrote:
> > This patch was already sent on:
> > - 9 Nov 2004
>
> Damn, yes. I have it. I don't consider those patches *that* important
> that I instantly forward the stuff, they'll go out with the next batch
> of v4l updates because it's less work that way.

It's usally considered a good idea to ACK a patch when you got it and
think it's okay.