2011-06-16 12:15:24

by Manuel Zerpies

Subject: [PATCH 10/11] wusb: 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/wusbcore/wa-xfer.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 6ccd93a..4193345 100644
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -83,6 +83,7 @@
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/hash.h>
+#include <linux/ratelimit.h>

#include "wa-hc.h"
#include "wusbhc.h"
@@ -1217,16 +1218,14 @@ static int wa_xfer_status_to_errno(u8 status)
if (status == 0)
return 0;
if (status >= ARRAY_SIZE(xlat)) {
- if (printk_ratelimit())
- printk(KERN_ERR "%s(): BUG? "
+ printk_ratelimited(KERN_ERR "%s(): BUG? "
"Unknown WA transfer status 0x%02x\n",
__func__, real_status);
return -EINVAL;
}
errno = xlat[status];
if (unlikely(errno > 0)) {
- if (printk_ratelimit())
- printk(KERN_ERR "%s(): BUG? "
+ printk_ratelimited(KERN_ERR "%s(): BUG? "
"Inconsistent WA status: 0x%02x\n",
__func__, real_status);
errno = -errno;
--
1.7.4.1

2011-06-16 14:36:17

by Sergei Shtylyov

Subject: Re: [PATCH 10/11] wusb: 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/wusbcore/wa-xfer.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)

> diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
> index 6ccd93a..4193345 100644
> --- a/drivers/usb/wusbcore/wa-xfer.c
> +++ b/drivers/usb/wusbcore/wa-xfer.c
> @@ -83,6 +83,7 @@
> #include <linux/spinlock.h>
> #include <linux/slab.h>
> #include <linux/hash.h>
> +#include <linux/ratelimit.h>
>
> #include "wa-hc.h"
> #include "wusbhc.h"
> @@ -1217,16 +1218,14 @@ static int wa_xfer_status_to_errno(u8 status)
> if (status == 0)
> return 0;
> if (status >= ARRAY_SIZE(xlat)) {
> - if (printk_ratelimit())
> - printk(KERN_ERR "%s(): BUG? "
> + printk_ratelimited(KERN_ERR "%s(): BUG? "
> "Unknown WA transfer status 0x%02x\n",
> __func__, real_status);
> return -EINVAL;
> }
> errno = xlat[status];
> if (unlikely(errno > 0)) {
> - if (printk_ratelimit())
> - printk(KERN_ERR "%s(): BUG? "
> + printk_ratelimited(KERN_ERR "%s(): BUG? "
> "Inconsistent WA status: 0x%02x\n",
> __func__, real_status);
> errno = -errno;

Why not pr_err_ratelimited()?

WBR, Sergei