diff options
author | Joe Perches <joe@perches.com> | 2013-10-26 20:49:24 -0700 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-05 11:15:36 +0200 |
commit | 1b667c7507f5a34d4f4d2a18c63ebba0139a6d70 (patch) | |
tree | 6a9a09f4b2e59c5faac22ba5c4c0df4ed7fda5d0 | |
parent | 8152809394aea1d96e0ebf77700c9e4f2237d04e (diff) |
usbatm: Fix dynamic_debug / ratelimited atm_dbg and atm_rldbg macros
commit 32e24930fb71c47a1366325b6f139e039cacaca4 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r-- | drivers/usb/atm/usbatm.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h index 5651231a743..f3eecd967a8 100644 --- a/drivers/usb/atm/usbatm.h +++ b/drivers/usb/atm/usbatm.h @@ -34,6 +34,7 @@ #include <linux/stringify.h> #include <linux/usb.h> #include <linux/mutex.h> +#include <linux/ratelimit.h> /* #define VERBOSE_DEBUG @@ -59,13 +60,12 @@ atm_printk(KERN_INFO, instance , format , ## arg) #define atm_warn(instance, format, arg...) \ atm_printk(KERN_WARNING, instance , format , ## arg) -#define atm_dbg(instance, format, arg...) \ - dynamic_pr_debug("ATM dev %d: " format , \ - (instance)->atm_dev->number , ## arg) -#define atm_rldbg(instance, format, arg...) \ - if (printk_ratelimit()) \ - atm_dbg(instance , format , ## arg) - +#define atm_dbg(instance, format, ...) \ + pr_debug("ATM dev %d: " format, \ + (instance)->atm_dev->number, ##__VA_ARGS__) +#define atm_rldbg(instance, format, ...) \ + pr_debug_ratelimited("ATM dev %d: " format, \ + (instance)->atm_dev->number, ##__VA_ARGS__) /* flags, set by mini-driver in bind() */ |