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

Commit 1c20163d authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

usb: kill DEBUG compile option 



In the drivers that no longer need it, it is removed.
It is removed from the Makefile. Drivers not fully converted
to dynamic debug have it shifted down into the individual
drivers.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b5fa3b2

drivers/usb/host/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
# Makefile for USB Host Controller Drivers

#



ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG



# tell define_trace.h where to find the xhci trace header

CFLAGS_xhci-trace.o := -I$(src)

drivers/usb/host/ehci-dbg.c

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


/* this file is part of ehci-hcd.c */



#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG



/* check the values in the HCSPARAMS register

 * (host controller _Structural_ parameters)
@@ -62,7 +62,7 @@ static inline void dbg_hcs_params (struct ehci_hcd *ehci, char *label) {} 


#endif



#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG



/* check the values in the HCCPARAMS register

 * (host controller _Capability_ parameters)
@@ -101,7 +101,7 @@ static inline void dbg_hcc_params (struct ehci_hcd *ehci, char *label) {} 


#endif



#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG



static void __maybe_unused

dbg_qtd (const char *label, struct ehci_hcd *ehci, struct ehci_qtd *qtd)
@@ -301,7 +301,7 @@ static inline int __maybe_unused 
dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)

{ return 0; }



#endif	/* DEBUG || CONFIG_DYNAMIC_DEBUG */

#endif	/* CONFIG_DYNAMIC_DEBUG */



/* functions have the "wrong" filename when they're output... */

#define dbg_status(ehci, label, status) { \

drivers/usb/host/ehci-fsl.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int ehci_fsl_mpc512x_drv_suspend(struct device *dev) 
	struct fsl_usb2_platform_data *pdata = dev_get_platdata(dev);

	u32 tmp;



#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG

	u32 mode = ehci_readl(ehci, hcd->regs + FSL_SOC_USB_USBMODE);

	mode &= USBMODE_CM_MASK;

	tmp = ehci_readl(ehci, hcd->regs + 0x140);	/* usbcmd */

drivers/usb/host/ehci-hcd.c

+3 −3
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static int __init ehci_hcd_init(void) 
		 sizeof(struct ehci_qh), sizeof(struct ehci_qtd),

		 sizeof(struct ehci_itd), sizeof(struct ehci_sitd));



#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG

	ehci_debug_root = debugfs_create_dir("ehci", usb_debug_root);

	if (!ehci_debug_root) {

		retval = -ENOENT;
@@ -1362,7 +1362,7 @@ static int __init ehci_hcd_init(void) 
	platform_driver_unregister(&PLATFORM_DRIVER);

clean0:

#endif

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG

	debugfs_remove(ehci_debug_root);

	ehci_debug_root = NULL;

err_debug:
@@ -1386,7 +1386,7 @@ static void __exit ehci_hcd_cleanup(void) 
#ifdef PS3_SYSTEM_BUS_DRIVER

	ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);

#endif

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG

	debugfs_remove(ehci_debug_root);

#endif

	clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);

drivers/usb/host/ehci-q.c

+2 −2
Original line number Diff line number Diff line
@@ -168,13 +168,13 @@ static void ehci_clear_tt_buffer(struct ehci_hcd *ehci, struct ehci_qh *qh, 
	 * Note: this routine is never called for Isochronous transfers.

	 */

	if (urb->dev->tt && !usb_pipeint(urb->pipe) && !qh->clearing_tt) {

#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

#ifdef CONFIG_DYNAMIC_DEBUG

		struct usb_device *tt = urb->dev->tt->hub;

		dev_dbg(&tt->dev,

			"clear tt buffer port %d, a%d ep%d t%08x\n",

			urb->dev->ttport, urb->dev->devnum,

			usb_pipeendpoint(urb->pipe), token);

#endif /* DEBUG || CONFIG_DYNAMIC_DEBUG */

#endif /* CONFIG_DYNAMIC_DEBUG */

		if (!ehci_is_TDI(ehci)

				|| urb->dev->tt->hub !=

				   ehci_to_hcd(ehci)->self.root_hub) {