| Message ID | 0a1488254bd51475a90133c0fc41a4d34b533ef4.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jun 16, 2011 at 02:06:37PM +0200, 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 <manuel.f.zerpies@ww.stud.uni-erlangen.de> > --- > drivers/ide/ide-atapi.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c > index 6f218e01..1b04f45 100644 > --- a/drivers/ide/ide-atapi.c > +++ b/drivers/ide/ide-atapi.c > @@ -8,6 +8,7 @@ > #include <linux/ide.h> > #include <linux/scatterlist.h> > #include <linux/gfp.h> > +#include <linux/ratelimit.h> > > #include <scsi/scsi.h> > > @@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) > err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len, > GFP_NOIO); > if (unlikely(err)) { > - if (printk_ratelimit()) > - printk(KERN_WARNING PFX "%s: failed to map sense " > + printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense " > "buffer\n", drive->name); Does the printk fit on one line if you do pr_warn_ratelimited(...) instead? Thanks.
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 <manuel.f.zerpies@ww.stud.uni-erlangen.de> > --- > drivers/ide/ide-atapi.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c > index 6f218e01..1b04f45 100644 > --- a/drivers/ide/ide-atapi.c > +++ b/drivers/ide/ide-atapi.c > @@ -8,6 +8,7 @@ > #include <linux/ide.h> > #include <linux/scatterlist.h> > #include <linux/gfp.h> > +#include <linux/ratelimit.h> > > #include <scsi/scsi.h> > > @@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) > err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len, > GFP_NOIO); > if (unlikely(err)) { > - if (printk_ratelimit()) > - printk(KERN_WARNING PFX "%s: failed to map sense " > + printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense " Why not pr_warn_ratelimited()? WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 6f218e01..1b04f45 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -8,6 +8,7 @@ #include <linux/ide.h> #include <linux/scatterlist.h> #include <linux/gfp.h> +#include <linux/ratelimit.h> #include <scsi/scsi.h> @@ -200,8 +201,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len, GFP_NOIO); if (unlikely(err)) { - if (printk_ratelimit()) - printk(KERN_WARNING PFX "%s: failed to map sense " + printk_ratelimited(KERN_WARNING PFX "%s: failed to map sense " "buffer\n", drive->name); return; }
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 <manuel.f.zerpies@ww.stud.uni-erlangen.de> --- drivers/ide/ide-atapi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)