2011-06-16 12:16:08

by Manuel Zerpies

Subject: [PATCH 11/11] usb/class: 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/class/usblp.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 9eca405..cb3a932 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -58,6 +58,7 @@
#include <linux/mutex.h>
#undef DEBUG
#include <linux/usb.h>
+#include <linux/ratelimit.h>

/*
* Version Information
@@ -348,8 +349,7 @@ static int usblp_check_status(struct usblp *usblp, int err)
mutex_lock(&usblp->mut);
if ((error = usblp_read_status(usblp, usblp->statusbuf)) < 0) {
mutex_unlock(&usblp->mut);
- if (printk_ratelimit())
- printk(KERN_ERR
+ printk_ratelimited(KERN_ERR
"usblp%d: error %d reading printer status\n",
usblp->minor, error);
return 0;
@@ -653,8 +653,7 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

case LPGETSTATUS:
if ((retval = usblp_read_status(usblp, usblp->statusbuf))) {
- if (printk_ratelimit())
- printk(KERN_ERR "usblp%d:"
+ printk_ratelimited(KERN_ERR "usblp%d:"
"failed reading printer status (%d)\n",
usblp->minor, retval);
retval = -EIO;
--
1.7.4.1

2011-06-16 15:36:11

by Pete Zaitcev

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

On Thu, 16 Jun 2011 14:15:54 +0200
Manuel Zerpies <[email protected]> wrote:

> +++ b/drivers/usb/class/usblp.c
> @@ -348,8 +349,7 @@ static int usblp_check_status(struct usblp *usblp, int err)
> mutex_lock(&usblp->mut);
> if ((error = usblp_read_status(usblp, usblp->statusbuf)) < 0) {
> mutex_unlock(&usblp->mut);
> - if (printk_ratelimit())
> - printk(KERN_ERR
> + printk_ratelimited(KERN_ERR
> "usblp%d: error %d reading printer status\n",

I wish you went a step further and placed the state into usblp,
but it works for now, ACK. I should've done it myself, really.

-- Pete