Commit e8164f64 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

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: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 746cdd0b

drivers/usb/musb/Kconfig

+6 −7
Original line number Diff line number Diff line
@@ -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.

drivers/usb/musb/Makefile

+2 −14
Original line number Diff line number Diff line
@@ -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

endif



ifneq ($(MUSB_DEBUG),0)

ifeq ($(CONFIG_USB_MUSB_DEBUG),y)

	EXTRA_CFLAGS += -DDEBUG

endif
 


EXTRA_CFLAGS += -DMUSB_DEBUG=$(MUSB_DEBUG)

drivers/usb/musb/musb_core.c

+4 −13
Original line number Diff line number Diff line
@@ -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

drivers/usb/musb/musb_debug.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

{