aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-28 14:33:02 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 19:35:17 -0400
commit1d896ceae46d61412a575a4fc269f5eb4b0397d6 (patch)
tree84f4909224209e6de974b51a8f4871660aedc23e /drivers/usb/host
parent641c86cd1cc6cb42233500a20e85ae5027826cfa (diff)
USB: isp116x: remove dependency on CONFIG_USB_DEBUG
Move all debugging messages in the driver to use the dynamic debug subsystem, and not rely on CONFIG_USB_DEBUG to turn them on or off. This lets debugging be enabled without having to rebuild the driver, an important thing for users that can not do it. It also removes the pointless IRQ_TEST() macro, as that was totally useless and obviously never used. Cc: Olav Kongas <ok@artecdesign.ee> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/isp116x.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index 9a2c400e6090..dd34b7a33965 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -325,11 +325,7 @@ struct isp116x_ep {
325 325
326/*-------------------------------------------------------------------------*/ 326/*-------------------------------------------------------------------------*/
327 327
328#ifdef DEBUG 328#define DBG(stuff...) pr_debug("116x: " stuff)
329#define DBG(stuff...) printk(KERN_DEBUG "116x: " stuff)
330#else
331#define DBG(stuff...) do{}while(0)
332#endif
333 329
334#ifdef VERBOSE 330#ifdef VERBOSE
335# define VDBG DBG 331# define VDBG DBG
@@ -358,15 +354,8 @@ struct isp116x_ep {
358#define isp116x_check_platform_delay(h) 0 354#define isp116x_check_platform_delay(h) 0
359#endif 355#endif
360 356
361#if defined(DEBUG)
362#define IRQ_TEST() BUG_ON(!irqs_disabled())
363#else
364#define IRQ_TEST() do{}while(0)
365#endif
366
367static inline void isp116x_write_addr(struct isp116x *isp116x, unsigned reg) 357static inline void isp116x_write_addr(struct isp116x *isp116x, unsigned reg)
368{ 358{
369 IRQ_TEST();
370 writew(reg & 0xff, isp116x->addr_reg); 359 writew(reg & 0xff, isp116x->addr_reg);
371 isp116x_delay(isp116x, 300); 360 isp116x_delay(isp116x, 300);
372} 361}