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>
This commit is contained in:
matt mooney 2011-05-11 01:54:13 -07:00 committed by Greg Kroah-Hartman
parent 0c4ac072b3
commit 981f30cc9b
4 changed files with 9 additions and 10 deletions

View File

@ -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---

View File

@ -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

View File

@ -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;

View File

@ -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),