lkml.org 
[lkml]   [2004]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[11/11] misc bttv statification
    The patch below makes some bttv code static.

    It could be splitted into three patches, but has overlapping context
    (and isn't too big altogether).


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


    Signed-off-by: Adrian Bunk <bunk@stusta.de>

    --- 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;
    @@ -3003,7 +2983,7 @@
    #else
    /* new 2.5.x way -- via hotplug firmware loader */

    -int __devinit pvr_boot(struct bttv *btv)
    +static int __devinit pvr_boot(struct bttv *btv)
    {
    const struct firmware *fw_entry;
    int rc;
    --- 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:
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:07    [W:0.023 / U:29.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site