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

Commit 523e531e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: phy: remove custom DBG macro 



Use the in-kernel pr_debug() calls instead of trying to roll your own
DBG macro.  This means the dynamic debugging calls now work here, and
there is no dependency on CONFIG_USB_DEBUG for the phy code anymore.

Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c21c985

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ static int fsl_otg_set_peripheral(struct usb_otg *otg, 
	otg_dev->fsm.b_bus_req = 1;

	otg_dev->fsm.b_bus_req = 1;





	/* start the gadget right away if the ID pin says Mini-B */

	/* start the gadget right away if the ID pin says Mini-B */

	DBG("ID pin=%d\n", otg_dev->fsm.id);

	pr_debug("ID pin=%d\n", otg_dev->fsm.id);

	if (otg_dev->fsm.id == 1) {

	if (otg_dev->fsm.id == 1) {

		fsl_otg_start_host(&otg_dev->fsm, 0);

		fsl_otg_start_host(&otg_dev->fsm, 0);

		otg_drv_vbus(&otg_dev->fsm, 0);

		otg_drv_vbus(&otg_dev->fsm, 0);
@@ -684,7 +684,7 @@ static int fsl_otg_start_hnp(struct usb_otg *otg) 
	if (otg_dev != fsl_otg_dev)

	if (otg_dev != fsl_otg_dev)

		return -ENODEV;

		return -ENODEV;





	DBG("start_hnp...n");

	pr_debug("start_hnp...\n");





	/* clear a_bus_req to enter a_suspend state */

	/* clear a_bus_req to enter a_suspend state */

	otg_dev->fsm.a_bus_req = 0;

	otg_dev->fsm.a_bus_req = 0;
@@ -941,7 +941,7 @@ int usb_otg_start(struct platform_device *pdev) 
		p_otg->fsm.id = 0;

		p_otg->fsm.id = 0;

	}

	}





	DBG("initial ID pin=%d\n", p_otg->fsm.id);

	pr_debug("initial ID pin=%d\n", p_otg->fsm.id);





	/* enable OTG ID pin interrupt */

	/* enable OTG ID pin interrupt */

	temp = fsl_readl(&p_otg->dr_mem_map->otgsc);

	temp = fsl_readl(&p_otg->dr_mem_map->otgsc);

drivers/usb/phy/phy-fsm-usb.h

+2 −9
Original line number Original line Diff line number Diff line
@@ -15,18 +15,11 @@ 
 * 675 Mass Ave, Cambridge, MA 02139, USA.

 * 675 Mass Ave, Cambridge, MA 02139, USA.

 */

 */





#undef DEBUG

#undef VERBOSE

#undef VERBOSE





#ifdef DEBUG

#define DBG(fmt, args...) printk(KERN_DEBUG "[%s]  " fmt , \

				 __func__, ## args)

#else

#define DBG(fmt, args...)	do {} while (0)

#endif



#ifdef VERBOSE

#ifdef VERBOSE

#define VDBG		DBG

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

				 __func__, ## args)

#else

#else

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

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

#endif

#endif

drivers/usb/phy/phy-isp1301-omap.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -40,9 +40,7 @@ 




#include <mach/usb.h>

#include <mach/usb.h>





#ifndef	DEBUG

#undef VERBOSE

#undef VERBOSE

#endif









#define	DRIVER_VERSION	"24 August 2004"

#define	DRIVER_VERSION	"24 August 2004"
@@ -387,7 +385,6 @@ static void b_idle(struct isp1301 *isp, const char *tag) 
static void

static void

dump_regs(struct isp1301 *isp, const char *label)

dump_regs(struct isp1301 *isp, const char *label)

{

{

#ifdef	DEBUG

	u8	ctrl = isp1301_get_u8(isp, ISP1301_OTG_CONTROL_1);

	u8	ctrl = isp1301_get_u8(isp, ISP1301_OTG_CONTROL_1);

	u8	status = isp1301_get_u8(isp, ISP1301_OTG_STATUS);

	u8	status = isp1301_get_u8(isp, ISP1301_OTG_STATUS);

	u8	src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);

	u8	src = isp1301_get_u8(isp, ISP1301_INTERRUPT_SOURCE);
@@ -396,7 +393,6 @@ dump_regs(struct isp1301 *isp, const char *label) 
		omap_readl(OTG_CTRL), label, state_name(isp),

		omap_readl(OTG_CTRL), label, state_name(isp),

		ctrl, status, src);

		ctrl, status, src);

	/* mode control and irq enables don't change much */

	/* mode control and irq enables don't change much */

#endif

}

}





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

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