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

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
...@@ -35,8 +35,8 @@ config USB_IP_HOST ...@@ -35,8 +35,8 @@ config USB_IP_HOST
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called usbip. module will be called usbip.
config USB_IP_DEBUG_ENABLE config USB_IP_DEBUG
bool "USB-IP Debug Enable" bool "USB/IP debug messages"
depends on USB_IP_COMMON depends on USB_IP_COMMON
default N default N
---help--- ---help---
......
ccflags-$(CONFIG_USB_IP_DEBUG) := -DDEBUG
obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o
usbip_common_mod-y := usbip_common.o usbip_event.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 ...@@ -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 obj-$(CONFIG_USB_IP_HOST) += usbip.o
usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o
ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>" #define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>"
#define DRIVER_DESC "USB/IP Common Driver" #define DRIVER_DESC "USB/IP Common Driver"
#ifdef CONFIG_USB_IP_DEBUG_ENABLE #ifdef CONFIG_USB_IP_DEBUG
unsigned long usbip_debug_flag = 0xffffffff; unsigned long usbip_debug_flag = 0xffffffff;
#else #else
unsigned long usbip_debug_flag; unsigned long usbip_debug_flag;
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <net/sock.h> #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: * @fmt:
* @args: * @args:
*/ */
#ifdef CONFIG_USB_IP_DEBUG_ENABLE #ifdef CONFIG_USB_IP_DEBUG
#define usbip_udbg(fmt, args...) \ #define usbip_udbg(fmt, args...) \
do { \ do { \
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
__FILE__, __LINE__, __func__, ##args); \ __FILE__, __LINE__, __func__, ##args); \
} while (0) } while (0)
#else /* CONFIG_USB_IP_DEBUG_ENABLE */ #else
#define usbip_udbg(fmt, args...) do { } while (0) #define usbip_udbg(fmt, args...) do { } while (0)
#endif /* CONFIG_USB_IP_DEBUG_ENABLE */ #endif /* CONFIG_USB_IP_DEBUG */
enum { enum {
usbip_debug_xmit = (1 << 0), usbip_debug_xmit = (1 << 0),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment