usb: musb: get rid of MUSB_LOGLEVEL and use parameter

We can change debugging level on the fly via
/sys/module/musb_hdrc/parameters/debug.

We can also get rid of the LOGLEVEL facility in Kconfig
and rely only in module parameter.

Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index faca4333f27a8125a46fcbb7d32362ac56fc3524..a0017486ad4ea27f6220764ede93cb3562e59247 100644 (file)
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -165,12 +165,11 @@ config USB_TUSB_OMAP_DMA
        help
          Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
 
-config USB_MUSB_LOGLEVEL
+config USB_MUSB_DEBUG
        depends on USB_MUSB_HDRC
-       int  'Logging Level (0 - none / 3 - annoying / ... )'
-       default 0
+       bool "Enable debugging messages"
+       default n
        help
-         Set the logging level. 0 disables the debugging altogether,
-         although when USB_DEBUG is set the value is at least 1.
-         Starting at level 3, per-transfer (urb, usb_request, packet,
-         or dma transfer) tracing may kick in.
+         This enables musb debugging. To set the logging level use the debug
+         module parameter. Starting at level 3, per-transfer (urb, usb_request,
+         packet, or dma transfer) tracing may kick in.

diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 860369c7cbe1b816e1e0806837b4e0b3756fdf33..b6af0d687a73657b27fc87fd8c57153fc7f2021d 100644 (file)
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -64,18 +64,6 @@ endif
 
 # Debugging
 
-MUSB_DEBUG:=$(CONFIG_USB_MUSB_LOGLEVEL)
-
-ifeq ("$(strip $(MUSB_DEBUG))","")
-    ifdef CONFIG_USB_DEBUG
-       MUSB_DEBUG:=1
-    else
-       MUSB_DEBUG:=0
-    endif
+ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
+       EXTRA_CFLAGS += -DDEBUG
 endif
-
-ifneq ($(MUSB_DEBUG),0)
-    EXTRA_CFLAGS += -DDEBUG
-endif
-
-EXTRA_CFLAGS += -DMUSB_DEBUG=$(MUSB_DEBUG)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 99690ba436dcec5263b2dfcde3f5ee99731d4da5..c5b8f0296fcf2f9f9a7ab40404d1f8324e325508 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -114,23 +114,14 @@
 
 
 
-#if MUSB_DEBUG > 0
-unsigned debug = MUSB_DEBUG;
-module_param(debug, uint, 0);
-MODULE_PARM_DESC(debug, "initial debug message level");
-
-#define MUSB_VERSION_SUFFIX    "/dbg"
-#endif
+unsigned debug;
+module_param(debug, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug message level. Default = 0");
 
 #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia"
 #define DRIVER_DESC "Inventra Dual-Role USB Controller Driver"
 
-#define MUSB_VERSION_BASE "6.0"
-
-#ifndef MUSB_VERSION_SUFFIX
-#define MUSB_VERSION_SUFFIX    ""
-#endif
-#define MUSB_VERSION   MUSB_VERSION_BASE MUSB_VERSION_SUFFIX
+#define MUSB_VERSION "6.0"
 
 #define DRIVER_INFO DRIVER_DESC ", v" MUSB_VERSION
 

diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 3bdb311e820d454ee4e801a05247c5464ef1a839..4d2794441b153ac6c2f745b99f06c245cb56bbe5 100644 (file)
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -48,11 +48,7 @@
                                __func__, __LINE__ , ## args); \
        } } while (0)
 
-#if MUSB_DEBUG > 0
 extern unsigned debug;
-#else
-#define debug  0
-#endif
 
 static inline int _dbg_level(unsigned l)
 {