From 93aedb43299bdbdb5a1e82da36832b4565ee55d5 Mon Sep 17 00:00:00 2001 From: matt mooney Date: Wed, 11 May 2011 01:54:13 -0700 Subject: [PATCH] --- yaml --- r: 249601 b: refs/heads/master c: 981f30cc9b93fbf1f722f31276ddb19b95a30ddd h: refs/heads/master i: 249599: c8671a147cfd70890c5352d55ca5b4663f87ca91 v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/Kconfig | 4 ++-- trunk/drivers/staging/usbip/Makefile | 5 ++--- trunk/drivers/staging/usbip/usbip_common.c | 2 +- trunk/drivers/staging/usbip/usbip_common.h | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index db7cf6372732..26bd4dffcf17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c4ac072b3f5e1287a11f109ca0cc9c909d74919 +refs/heads/master: 981f30cc9b93fbf1f722f31276ddb19b95a30ddd diff --git a/trunk/drivers/staging/usbip/Kconfig b/trunk/drivers/staging/usbip/Kconfig index 2c1d10acb8b5..466f0d3ca7fa 100644 --- a/trunk/drivers/staging/usbip/Kconfig +++ b/trunk/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/trunk/drivers/staging/usbip/Makefile b/trunk/drivers/staging/usbip/Makefile index 279f3cc3eea8..a43a890a8267 100644 --- a/trunk/drivers/staging/usbip/Makefile +++ b/trunk/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/trunk/drivers/staging/usbip/usbip_common.c b/trunk/drivers/staging/usbip/usbip_common.c index b46e9b5d94b9..279cad4dc654 100644 --- a/trunk/drivers/staging/usbip/usbip_common.c +++ b/trunk/drivers/staging/usbip/usbip_common.c @@ -30,7 +30,7 @@ #define DRIVER_AUTHOR "Takahiro Hirofuchi " #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/trunk/drivers/staging/usbip/usbip_common.h b/trunk/drivers/staging/usbip/usbip_common.h index 0b61d710059a..c84bed9a044c 100644 --- a/trunk/drivers/staging/usbip/usbip_common.h +++ b/trunk/drivers/staging/usbip/usbip_common.h @@ -27,11 +27,11 @@ #include /** - * 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),