From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit() Date: Thu, 16 Jun 2011 16:19:30 +0200 Message-ID: <20110616141930.GA12872@eferding.osrc.amd.com> References: <0a1488254bd51475a90133c0fc41a4d34b533ef4.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Return-path: Received: from mail.skyhub.de ([78.46.96.112]:40441 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758085Ab1FPOTN (ORCPT ); Thu, 16 Jun 2011 10:19:13 -0400 Content-Disposition: inline In-Reply-To: <0a1488254bd51475a90133c0fc41a4d34b533ef4.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Manuel Zerpies Cc: "David S. Miller" , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, christian.dietrich@informatik.uni-erlangen.de 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 > --- > 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 > #include > #include > +#include > > #include > > @@ -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. -- Regards/Gruss, Boris.