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

Commit 411a861f authored by Himanshu's avatar Himanshu Committed by Greg Kroah-Hartman
Browse files

Staging: usbip: Seperate usbip config debug from CONFIG_USB_DEBUG 



Signed-off-by: default avatarHimanshu <himanshu@symmetricore.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a439f5bf

drivers/staging/usbip/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -34,3 +34,10 @@ config USB_IP_HOST 


	 To compile this driver as a module, choose M here: the

	 module will be called usbip.



config USB_IP_DEBUG_ENABLE

	bool "USB-IP Debug Enable"

	depends on USB_IP_COMMON

	default N

	---help---

	  This enables the debug messages from the USB-IP drivers.

drivers/staging/usbip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ vhci-hcd-objs := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o 
obj-$(CONFIG_USB_IP_HOST) += usbip.o

usbip-objs := stub_dev.o stub_main.o stub_rx.o stub_tx.o



ifeq ($(CONFIG_USB_DEBUG),y)

ifeq ($(CONFIG_USB_IP_DEBUG_ENABLE),y)

	EXTRA_CFLAGS += -DDEBUG

endif

drivers/staging/usbip/usbip_common.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
/*-------------------------------------------------------------------------*/

/* debug routines */



#ifdef CONFIG_USB_DEBUG

#ifdef CONFIG_USB_IP_DEBUG_ENABLE

unsigned long usbip_debug_flag = 0xffffffff;

#else

unsigned long usbip_debug_flag;

drivers/staging/usbip/usbip_common.h

+4 −4
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ 
 */



/**

 * usbip_udbg - print debug messages if CONFIG_USB_DEBUG is defined

 * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG_ENABLE is defined

 * @fmt:

 * @args:

 */



#ifdef CONFIG_USB_DEBUG

#ifdef CONFIG_USB_IP_DEBUG_ENABLE



#define usbip_udbg(fmt, args...)					\

	do {								\
@@ -47,11 +47,11 @@ 
			__FILE__, __LINE__, __func__, ##args);		\

	} while (0)



#else  /* CONFIG_USB_DEBUG */

#else  /* CONFIG_USB_IP_DEBUG_ENABLE */



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



#endif /* CONFIG_USB_DEBUG */

#endif /* CONFIG_USB_IP_DEBUG_ENABLE */





enum {