aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-10-26 23:49:24 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-29 19:50:52 -0400
commit32e24930fb71c47a1366325b6f139e039cacaca4 (patch)
tree1384038ba0275cbc25acc6c0c9f5b870a5a27f87
parent29fc2bc75393864bbc9b90a7a13a0d0e11c6f41e (diff)
usbatm: Fix dynamic_debug / ratelimited atm_dbg and atm_rldbg macros
Fix atm_dbg to use normal pr_debug not dynamic_pr_debug because dynamic_pr_debug may not be compiled in at all. Signed-off-by: Joe Perches <joe@perches.com> Tested-by: Krzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/atm/usbatm.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index 5651231a7437..f3eecd967a8a 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -34,6 +34,7 @@
34#include <linux/stringify.h> 34#include <linux/stringify.h>
35#include <linux/usb.h> 35#include <linux/usb.h>
36#include <linux/mutex.h> 36#include <linux/mutex.h>
37#include <linux/ratelimit.h>
37 38
38/* 39/*
39#define VERBOSE_DEBUG 40#define VERBOSE_DEBUG
@@ -59,13 +60,12 @@
59 atm_printk(KERN_INFO, instance , format , ## arg) 60 atm_printk(KERN_INFO, instance , format , ## arg)
60#define atm_warn(instance, format, arg...) \ 61#define atm_warn(instance, format, arg...) \
61 atm_printk(KERN_WARNING, instance , format , ## arg) 62 atm_printk(KERN_WARNING, instance , format , ## arg)
62#define atm_dbg(instance, format, arg...) \ 63#define atm_dbg(instance, format, ...) \
63 dynamic_pr_debug("ATM dev %d: " format , \ 64 pr_debug("ATM dev %d: " format, \
64 (instance)->atm_dev->number , ## arg) 65 (instance)->atm_dev->number, ##__VA_ARGS__)
65#define atm_rldbg(instance, format, arg...) \ 66#define atm_rldbg(instance, format, ...) \
66 if (printk_ratelimit()) \ 67 pr_debug_ratelimited("ATM dev %d: " format, \
67 atm_dbg(instance , format , ## arg) 68 (instance)->atm_dev->number, ##__VA_ARGS__)
68
69 69
70/* flags, set by mini-driver in bind() */ 70/* flags, set by mini-driver in bind() */
71 71