From patchwork Mon Jun 20 08:17:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manuel Zerpies X-Patchwork-Id: 101058 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0698B6FDF for ; Mon, 20 Jun 2011 18:23:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751899Ab1FTIXB (ORCPT ); Mon, 20 Jun 2011 04:23:01 -0400 Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]:52915 "EHLO mx-rz-2.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844Ab1FTIXA convert rfc822-to-8bit (ORCPT ); Mon, 20 Jun 2011 04:23:00 -0400 X-Greylist: delayed 304 seconds by postgrey-1.27 at vger.kernel.org; Mon, 20 Jun 2011 04:23:00 EDT Received: from boeck5.rrze.uni-erlangen.de (boeck5.rrze.uni-erlangen.de [131.188.11.35]) by mx-rz-2.rrze.uni-erlangen.de (Postfix) with ESMTP id A4B7910E27; Mon, 20 Jun 2011 10:17:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at boeck5.rrze.uni-erlangen.de (RRZE) Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]) by boeck5.rrze.uni-erlangen.de (boeck5.rrze.uni-erlangen.de [131.188.11.35]) (amavisd-new, port 10026) with LMTP id i7MtRZbLixiH; Mon, 20 Jun 2011 10:17:55 +0200 (CEST) Received: from mx-rz-smart.rrze.uni-erlangen.de (mx-rz-smart.rrze.uni-erlangen.de [131.188.11.30]) by mx-rz-2.rrze.uni-erlangen.de (Postfix) with ESMTP id EC591133EF; Mon, 20 Jun 2011 10:17:54 +0200 (CEST) X-RRZE-Submit-IP: 209.85.160.174 Received: from mail-gy0-f174.google.com (mail-gy0-f174.google.com [209.85.160.174]) (Authenticated sender: U2FsdGVkX19D/ut3RWPDH/1ak9osytmr9InXR/REnM4=) by smtp-auth.uni-erlangen.de (Postfix) with ESMTPSA id 9A4EB1131C; Mon, 20 Jun 2011 10:17:54 +0200 (CEST) Received: by gyh3 with SMTP id 3so1299553gyh.19 for ; Mon, 20 Jun 2011 01:17:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.165.40 with SMTP id d28mr6502485yhl.217.1308557873324; Mon, 20 Jun 2011 01:17:53 -0700 (PDT) Received: by 10.236.108.17 with HTTP; Mon, 20 Jun 2011 01:17:53 -0700 (PDT) In-Reply-To: <20110616141930.GA12872@eferding.osrc.amd.com> References: <0a1488254bd51475a90133c0fc41a4d34b533ef4.1308142053.git.manuel.f.zerpies@ww.stud.uni-erlangen.de> <20110616141930.GA12872@eferding.osrc.amd.com> Date: Mon, 20 Jun 2011 10:17:53 +0200 Message-ID: Subject: Re: [PATCH 01/11] drivers/ide: use printk_ratelimited() instead of printk_ratelimit() From: Manuel Zerpies To: Borislav Petkov , Manuel Zerpies , "David S. Miller" , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, christian.dietrich@informatik.uni-erlangen.de, sshtylyov@mvista.com Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Hello, 2011/6/16 Borislav Petkov > > On Thu, Jun 16, 2011 at 02:06:37PM +0200, Manuel Zerpies wrote: > > Does the printk fit on one line if you do > >        pr_warn_ratelimited(...) > > instead? > > Thanks. > > -- > Regards/Gruss, > Boris. No I'm affraid. I tried it, but it didn't fit the 80 chars per line code-styling. >Why not pr_warn_ratelimited()? >WBR, Sergei I just kind of ignored it. As you see, I built it in. Here my new patch: 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 |    6 +++---  1 files changed, 3 insertions(+), 3 deletions(-) -- 1.7.4.1 -- 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..c9e69d7 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -8,6 +8,7 @@  #include  #include  #include +#include  #include @@ -200,9 +201,8 @@ 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 " -    "buffer\n", drive->name); + pr_warn_ratelimited(PFX "%s: failed to map sense buffer\n", +    drive->name);   return;   }