lkml.org 
[lkml]   [2012]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] drivers: usb: gadget: add multiple definition guards
    If f_fs.c and u_serial.c are combined together using #include, which has
    been a common practice so far, the pr_vdebug macro is defined multiple
    times. Define it only once.

    Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    ---
    drivers/usb/gadget/f_fs.c | 4 ++++
    drivers/usb/gadget/u_serial.c | 4 ++++
    2 files changed, 8 insertions(+), 0 deletions(-)

    diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
    index dcd1c7f..27c841d 100644
    --- a/drivers/usb/gadget/f_fs.c
    +++ b/drivers/usb/gadget/f_fs.c
    @@ -33,11 +33,15 @@
    /* Debugging ****************************************************************/

    #ifdef VERBOSE_DEBUG
    +#ifndef pr_vdebug
    # define pr_vdebug pr_debug
    +#endif /* pr_vdebug */
    # define ffs_dump_mem(prefix, ptr, len) \
    print_hex_dump_bytes(pr_fmt(prefix ": "), DUMP_PREFIX_NONE, ptr, len)
    #else
    +#ifndef pr_vdebug
    # define pr_vdebug(...) do { } while (0)
    +#endif /* pr_vdebug */
    # define ffs_dump_mem(prefix, ptr, len) do { } while (0)
    #endif /* VERBOSE_DEBUG */

    diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
    index 5b3f5ff..da6d479 100644
    --- a/drivers/usb/gadget/u_serial.c
    +++ b/drivers/usb/gadget/u_serial.c
    @@ -132,11 +132,15 @@ static unsigned n_ports;


    #ifdef VERBOSE_DEBUG
    +#ifndef pr_vdebug
    #define pr_vdebug(fmt, arg...) \
    pr_debug(fmt, ##arg)
    +#endif /* pr_vdebug */
    #else
    +#ifndef pr_vdebig
    #define pr_vdebug(fmt, arg...) \
    ({ if (0) pr_debug(fmt, ##arg); })
    +#endif /* pr_vdebug */
    #endif

    /*-------------------------------------------------------------------------*/
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2012-06-11 12:01    [W:0.024 / U:0.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site