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: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 2c1d10acb8b52c6022461d9babb48c521f4bb93b..466f0d3ca7faefa45d07ca2a26e18d7e32b65745 100644 (file)
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -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---

diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile
index 279f3cc3eea80daa19bf2d6fe447efe4b3145d6a..a43a890a82671ee9dba581630e5469bebbb8cd9a 100644 (file)
--- a/drivers/staging/usbip/Makefile
+++ b/drivers/staging/usbip/Makefile
@@ -1,3 +1,5 @@
+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
-

diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index b46e9b5d94b919223519180dbe7a89851ba3de0c..279cad4dc654491e106206574786d449939658dc 100644 (file)
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -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;

diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 0b61d710059aa81216b52309061c1670ab5df904..c84bed9a044cc52e9025f4ca044572acb6e2c0e0 100644 (file)
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -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),