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

Commit e92634cd authored by Roger Quadros's avatar Roger Quadros Committed by Felipe Balbi
Browse files

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: default avatarRoger Quadros <rogerq@ti.com>
Reviewed-by: default avatarJun Li <jun.li@nxp.com>
Acked-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent ff3f0789

drivers/usb/common/usb-otg-fsm.c

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

{

drivers/usb/phy/phy-fsl-usb.c

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ 


#include "phy-fsl-usb.h"



#ifdef VERBOSE

#define VDBG(fmt, args...) pr_debug("[%s]  " fmt, \

				 __func__, ## args)

#else

#define VDBG(stuff...)	do {} while (0)

#endif



#define DRIVER_VERSION "Rev. 1.55"

#define DRIVER_AUTHOR "Jerry Huang/Li Yang"

#define DRIVER_DESC "Freescale USB OTG Transceiver Driver"

include/linux/usb/otg-fsm.h

+0 −15
Original line number Diff line number Diff line
@@ -21,21 +21,6 @@ 
#include <linux/mutex.h>

#include <linux/errno.h>



#undef VERBOSE



#ifdef VERBOSE

#define VDBG(fmt, args...) pr_debug("[%s]  " fmt , \

				 __func__, ## args)

#else

#define VDBG(stuff...)	do {} while (0)

#endif



#ifdef VERBOSE

#define MPC_LOC printk("Current Location [%s]:[%d]\n", __FILE__, __LINE__)

#else

#define MPC_LOC do {} while (0)

#endif



#define PROTO_UNDEF	(0)

#define PROTO_HOST	(1)

#define PROTO_GADGET	(2)