From patchwork Tue Oct 15 11:45:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 283598 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2A4882C014D for ; Tue, 15 Oct 2013 23:00:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758955Ab3JOL6p (ORCPT ); Tue, 15 Oct 2013 07:58:45 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:5526 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932585Ab3JOL6h (ORCPT ); Tue, 15 Oct 2013 07:58:37 -0400 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BKI15881; Tue, 15 Oct 2013 19:57:44 +0800 (CST) Received: from SZXEML462-HUB.china.huawei.com (10.82.67.205) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.3.146.0; Tue, 15 Oct 2013 19:57:44 +0800 Received: from localhost (10.135.68.221) by szxeml462-hub.china.huawei.com (10.82.67.205) with Microsoft SMTP Server id 14.3.146.0; Tue, 15 Oct 2013 19:57:37 +0800 From: Kefeng Wang To: CC: Greg Kroah-Hartman , "David S. Miller" , Pablo Neira Ayuso , "Stephen Hemminger" , Johannes Berg , "John W. Linville" , Stanislaw Gruszka , Johannes Berg , Francois Romieu , "Ben Hutchings" , Chas Williams , Marc Kleine-Budde , Samuel Ortiz , Paul Mackerras , Oliver Neukum , Konrad Rzeszutek Wilk , "Boris Ostrovsky" , David Vrabel , Rusty Russell , "Michael S. Tsirkin" , , , , Subject: [PATCH 10/18] net: peak_usb: use wrapper functions of net_ratelimit() to simplify code Date: Tue, 15 Oct 2013 19:45:06 +0800 Message-ID: <1381837514-50660-11-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 1.8.3.msysgit.0 In-Reply-To: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com> References: <1381837514-50660-1-git-send-email-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.68.221] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net_ratelimited_function() is called to simplify code. Signed-off-by: Kefeng Wang --- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c index 0b7a4c3..5166a1f 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -191,8 +191,7 @@ static void peak_usb_read_bulk_callback(struct urb *urb) return; default: - if (net_ratelimit()) - netdev_err(netdev, + net_ratelimited_function(netdev_err, netdev, "Rx urb aborted (%d)\n", urb->status); goto resubmit_urb; } @@ -260,9 +259,8 @@ static void peak_usb_write_bulk_callback(struct urb *urb) break; default: - if (net_ratelimit()) - netdev_err(netdev, "Tx urb aborted (%d)\n", - urb->status); + net_ratelimited_function(netdev_err, netdev, + "Tx urb aborted (%d)\n", urb->status); case -EPROTO: case -ENOENT: case -ECONNRESET: @@ -314,8 +312,7 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb, err = dev->adapter->dev_encode_msg(dev, skb, obuf, &size); if (err) { - if (net_ratelimit()) - netdev_err(netdev, "packet dropped\n"); + net_ratelimited_function(netdev_err, netdev, "packet dropped\n"); dev_kfree_skb(skb); stats->tx_dropped++; return NETDEV_TX_OK;