Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea0e6276 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi
Browse files

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.

Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 4cbe5a55

drivers/usb/gadget/f_fs.c

+4 −0
Original line number Diff line number Diff line
@@ -34,11 +34,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 */

drivers/usb/gadget/u_serial.c

+4 −0
Original line number Diff line number Diff line
@@ -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



/*-------------------------------------------------------------------------*/