Commit 654f3118 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Linus Torvalds
Browse files

[PATCH] USB: move CONFIG_USB_DEBUG checks into the Makefile 



This lets us remove a lot of code in the drivers that were all checking
the same thing.  It also found some bugs in a few of the drivers, which
has been fixed up.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87cf2039

drivers/usb/atm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -6,3 +6,7 @@ obj-$(CONFIG_USB_CXACRU) += cxacru.o 
obj-$(CONFIG_USB_SPEEDTOUCH)	+= speedtch.o

obj-$(CONFIG_USB_ATM)		+= usbatm.o

obj-$(CONFIG_USB_XUSBATM)	+= xusbatm.o



ifeq ($(CONFIG_USB_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif

drivers/usb/atm/usbatm.h

+0 −5
Original line number Diff line number Diff line
@@ -27,14 +27,9 @@ 
#include <linux/config.h>



/*

#define DEBUG

#define VERBOSE_DEBUG

*/



#if !defined (DEBUG) && defined (CONFIG_USB_DEBUG)

#	define DEBUG

#endif



#include <asm/semaphore.h>

#include <linux/atm.h>

#include <linux/atmdev.h>

drivers/usb/core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -14,3 +14,7 @@ ifeq ($(CONFIG_USB_DEVICEFS),y) 
endif



obj-$(CONFIG_USB)	+= usbcore.o



ifeq ($(CONFIG_USB_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif

drivers/usb/core/buffer.c

+0 −8
Original line number Diff line number Diff line
@@ -15,14 +15,6 @@ 
#include <asm/scatterlist.h>

#include <linux/dma-mapping.h>

#include <linux/dmapool.h>





#ifdef CONFIG_USB_DEBUG

	#define DEBUG

#else

	#undef DEBUG

#endif



#include <linux/usb.h>

#include "hcd.h"

drivers/usb/core/config.c

+0 −5
Original line number Diff line number Diff line 
#include <linux/config.h>



#ifdef CONFIG_USB_DEBUG

#define DEBUG

#endif



#include <linux/usb.h>

#include <linux/module.h>

#include <linux/init.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE