summaryrefslogtreecommitdiffstats
path: root/drivers/usb/common
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2017-03-30 09:46:41 +0300
committerFelipe Balbi <felipe.balbi@linux.intel.com>2017-04-11 10:58:23 +0300
commite92634cd4d37d5a2ea2fb0d55d25d50bbba1e8e0 (patch)
treed7c42434a231f631af08faef911b349d8433aaa4 /drivers/usb/common
parentff3f0789b3dc37869b8c45e023f01f9dca0cdd8f (diff)
downloadop-kernel-dev-e92634cd4d37d5a2ea2fb0d55d25d50bbba1e8e0.zip
op-kernel-dev-e92634cd4d37d5a2ea2fb0d55d25d50bbba1e8e0.tar.gz
usb: otg-fsm: Prevent build warning "VDBG" redefined
If usb/otg-fsm.h and usb/composite.h are included together then it results in the build warning [1]. Prevent that by defining VDBG locally. Also get rid of MPC_LOC which doesn't seem to be used by anyone. [1] - warning fixed by this patch: In file included from drivers/usb/dwc3/core.h:33, from drivers/usb/dwc3/ep0.c:33: include/linux/usb/otg-fsm.h:30:1: warning: "VDBG" redefined In file included from drivers/usb/dwc3/ep0.c:31: include/linux/usb/composite.h:615:1: warning: this is the location of the previous definition Signed-off-by: Roger Quadros <rogerq@ti.com> Reviewed-by: Jun Li <jun.li@nxp.com> Acked-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/common')
-rw-r--r--drivers/usb/common/usb-otg-fsm.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/common/usb-otg-fsm.c b/drivers/usb/common/usb-otg-fsm.c
index 2f537bb..b8fe31e 100644
--- a/drivers/usb/common/usb-otg-fsm.c
+++ b/drivers/usb/common/usb-otg-fsm.c
@@ -31,6 +31,13 @@
#include <linux/usb/otg.h>
#include <linux/usb/otg-fsm.h>
+#ifdef VERBOSE
+#define VDBG(fmt, args...) pr_debug("[%s] " fmt, \
+ __func__, ## args)
+#else
+#define VDBG(stuff...) do {} while (0)
+#endif
+
/* Change USB protocol when there is a protocol change */
static int otg_set_protocol(struct otg_fsm *fsm, int protocol)
{
OpenPOWER on IntegriCloud