renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
Code

usb: gadget: add multiple definition guards

Browse Source 
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.

Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Andrzej Pietrasiewicz 2012-06-11 11:13:15 +02:00 committed by Felipe Balbi
parent 4cbe5a555f
commit ea0e627623
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/gadget/f_fs.c
View File

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

4
drivers/usb/gadget/u_serial.c
View File

@ -132,11 +132,15 @@ static unsigned n_ports;
#ifdef VERBOSE_DEBUG #ifdef VERBOSE_DEBUG
#ifndef pr_vdebug
#define pr_vdebug(fmt, arg...) \ #define pr_vdebug(fmt, arg...) \
pr_debug(fmt, ##arg) pr_debug(fmt, ##arg)
#endif /* pr_vdebug */
#else #else
#ifndef pr_vdebig
#define pr_vdebug(fmt, arg...) \ #define pr_vdebug(fmt, arg...) \
({ if (0) pr_debug(fmt, ##arg); }) ({ if (0) pr_debug(fmt, ##arg); })
#endif /* pr_vdebug */
#endif #endif
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/