2011-06-16 12:12:51

by Manuel Zerpies

Subject: [PATCH 07/11] drivers/usb/atm: use printk_ratelimited() instead of printk_ratelimit()

Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited()

Signed-off-by: Manuel Zerpies <[email protected]>
---
drivers/usb/atm/usbatm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 989e16e..d3448ca 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -81,6 +81,7 @@
#include <linux/timer.h>
#include <linux/wait.h>
#include <linux/kthread.h>
+#include <linux/ratelimit.h>

#ifdef VERBOSE_DEBUG
static int usbatm_print_packet(const unsigned char *data, int len);
@@ -668,8 +669,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
/* racy disconnection check - fine */
if (!instance || instance->disconnected) {
#ifdef DEBUG
- if (printk_ratelimit())
- printk(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");
+ printk_ratelimited(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");
#endif
err = -ENODEV;
goto fail;
--
1.7.4.1

2011-06-16 14:39:11

by Sergei Shtylyov

Subject: Re: [PATCH 07/11] drivers/usb/atm: use printk_ratelimited() instead of printk_ratelimit()

Hello.

Manuel Zerpies wrote:

> Since printk_ratelimit() shouldn't be used anymore (see comment in
> include/linux/printk.h), replace it with printk_ratelimited()

> Signed-off-by: Manuel Zerpies <[email protected]>
> ---
> drivers/usb/atm/usbatm.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

> diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
> index 989e16e..d3448ca 100644
> --- a/drivers/usb/atm/usbatm.c
> +++ b/drivers/usb/atm/usbatm.c
> @@ -81,6 +81,7 @@
> #include <linux/timer.h>
> #include <linux/wait.h>
> #include <linux/kthread.h>
> +#include <linux/ratelimit.h>
>
> #ifdef VERBOSE_DEBUG
> static int usbatm_print_packet(const unsigned char *data, int len);
> @@ -668,8 +669,7 @@ static int usbatm_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)
> /* racy disconnection check - fine */
> if (!instance || instance->disconnected) {
> #ifdef DEBUG
> - if (printk_ratelimit())
> - printk(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");
> + printk_ratelimited(KERN_DEBUG "%s: %s!\n", __func__, instance ? "disconnected" : "NULL instance");
> #endif

You could use pr_debug_ratelimited() and eliminate #ifdef with that.

WBR, Sergei