lkml.org 
[lkml]   [2008]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[BUILDFIX PATCH] au0828: debug is a poor global identifier
    From
    Date
    Avoid link-time warnings with debug declared in x86/kernel/entry_32.S

    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
    Otherwise you'll see link time warnings about multiple defintions of
    debug. (size 4 here, size 76 in entry_32.S)

    drivers/media/video/au0828/au0828-core.c | 14 +++++++-------
    drivers/media/video/au0828/au0828.h | 4 ++--
    2 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c
    index e65d564..9b7a4d7 100644
    --- a/drivers/media/video/au0828/au0828-core.c
    +++ b/drivers/media/video/au0828/au0828-core.c
    @@ -32,9 +32,9 @@
    * 4 = I2C related
    * 8 = Bridge related
    */
    -unsigned int debug;
    -module_param(debug, int, 0644);
    -MODULE_PARM_DESC(debug, "enable debug messages");
    +unsigned int au0828_debug;
    +module_param(au0828_debug, int, 0644);
    +MODULE_PARM_DESC(au0828_debug, "enable debug messages");

    unsigned int usb_debug;
    module_param(usb_debug, int, 0644);
    @@ -229,23 +229,23 @@ static int __init au0828_init(void)
    {
    int ret;

    - if (debug)
    + if (au0828_debug)
    printk(KERN_INFO "%s() Debugging is enabled\n", __func__);

    if (usb_debug) {
    printk(KERN_INFO "%s() USB Debugging is enabled\n", __func__);
    - debug |= 2;
    + au0828_debug |= 2;
    }

    if (i2c_debug) {
    printk(KERN_INFO "%s() I2C Debugging is enabled\n", __func__);
    - debug |= 4;
    + au0828_debug |= 4;
    }

    if (bridge_debug) {
    printk(KERN_INFO "%s() Bridge Debugging is enabled\n",
    __func__);
    - debug |= 8;
    + au0828_debug |= 8;
    }

    printk(KERN_INFO "au0828 driver loaded\n");
    diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
    index 0200b9f..8344c45 100644
    --- a/drivers/media/video/au0828/au0828.h
    +++ b/drivers/media/video/au0828/au0828.h
    @@ -96,7 +96,7 @@ struct au0828_buff {
    /* au0828-core.c */
    extern u32 au0828_read(struct au0828_dev *dev, u16 reg);
    extern u32 au0828_write(struct au0828_dev *dev, u16 reg, u32 val);
    -extern unsigned int debug;
    +extern unsigned int au0828_debug;
    extern unsigned int usb_debug;
    extern unsigned int bridge_debug;

    @@ -123,6 +123,6 @@ extern int au0828_dvb_register(struct au0828_dev *dev);
    extern void au0828_dvb_unregister(struct au0828_dev *dev);

    #define dprintk(level, fmt, arg...)\
    - do { if (debug & level)\
    + do { if (au0828_debug & level)\
    printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\
    } while (0)
    --
    1.5.5.1.270.g89765




    \
     
     \ /
      Last update: 2008-04-26 08:17    [W:2.336 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site