Commit 981f30cc authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: change debug configuration option



Change CONFIG_USB_IP_DEBUG_ENABLE to CONFIG_USB_IP_DEBUG, and move
ccflags- to the head of the makefile.

Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0c4ac072
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 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"
config USB_IP_DEBUG
	bool "USB/IP debug messages"
	depends on USB_IP_COMMON
	default N
	---help---
+2 −3
Original line number Diff line number Diff line
ccflags-$(CONFIG_USB_IP_DEBUG) := -DDEBUG

obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o
usbip_common_mod-y := usbip_common.o usbip_event.o

@@ -6,6 +8,3 @@ vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o

obj-$(CONFIG_USB_IP_HOST) += usbip.o
usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o

ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
#define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>"
#define DRIVER_DESC "USB/IP Common Driver"

#ifdef CONFIG_USB_IP_DEBUG_ENABLE
#ifdef CONFIG_USB_IP_DEBUG
unsigned long usbip_debug_flag = 0xffffffff;
#else
unsigned long usbip_debug_flag;
+4 −4
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@
#include <net/sock.h>

/**
 * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG_ENABLE is defined
 * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG is defined
 * @fmt:
 * @args:
 */
#ifdef CONFIG_USB_IP_DEBUG_ENABLE
#ifdef CONFIG_USB_IP_DEBUG

#define usbip_udbg(fmt, args...)					\
	do {								\
@@ -40,11 +40,11 @@
		       __FILE__, __LINE__, __func__, ##args);		\
	} while (0)

#else  /* CONFIG_USB_IP_DEBUG_ENABLE */
#else

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

#endif /* CONFIG_USB_IP_DEBUG_ENABLE */
#endif /* CONFIG_USB_IP_DEBUG */

enum {
	usbip_debug_xmit	= (1 << 0),