From patchwork Mon Mar 11 16:54:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Manoil X-Patchwork-Id: 226618 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 D9EEF2C02C4 for ; Tue, 12 Mar 2013 04:09:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754001Ab3CKRJu (ORCPT ); Mon, 11 Mar 2013 13:09:50 -0400 Received: from mail-db8lp0188.outbound.messaging.microsoft.com ([213.199.154.188]:9905 "EHLO db8outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753213Ab3CKRJu (ORCPT ); Mon, 11 Mar 2013 13:09:50 -0400 X-Greylist: delayed 902 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 Mar 2013 13:09:49 EDT Received: from mail216-db8-R.bigfish.com (10.174.8.233) by DB8EHSOBE031.bigfish.com (10.174.4.94) with Microsoft SMTP Server id 14.1.225.23; Mon, 11 Mar 2013 16:54:46 +0000 Received: from mail216-db8 (localhost [127.0.0.1]) by mail216-db8-R.bigfish.com (Postfix) with ESMTP id 662EE1600ED; Mon, 11 Mar 2013 16:54:46 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah107ah11b5h121eh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14afh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail216-db8 (localhost.localdomain [127.0.0.1]) by mail216-db8 (MessageSwitch) id 1363020883681422_20128; Mon, 11 Mar 2013 16:54:43 +0000 (UTC) Received: from DB8EHSMHS013.bigfish.com (unknown [10.174.8.235]) by mail216-db8.bigfish.com (Postfix) with ESMTP id A3FA34E0149; Mon, 11 Mar 2013 16:54:43 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS013.bigfish.com (10.174.4.23) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 11 Mar 2013 16:54:43 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 11 Mar 2013 16:54:40 +0000 Received: from zro04cle141.ea.freescale.net (udp157456uds.ea.freescale.net [140.101.223.141]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r2BGscsa013490; Mon, 11 Mar 2013 09:54:39 -0700 Received: by zro04cle141.ea.freescale.net (Postfix, from userid 23113) id 8E9D640081; Mon, 11 Mar 2013 18:54:37 +0200 (EET) From: Claudiu Manoil To: CC: Paul Gortmaker , "David S. Miller" Subject: [PATCH net-next 1/2] gianfar: Remove superfluous gfar_new_skb() Date: Mon, 11 Mar 2013 18:54:36 +0200 Message-ID: <1363020877-30223-1-git-send-email-claudiu.manoil@freescale.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-OriginatorOrg: freescale.net Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org gfar_new_skb() does nothing more than to call the static gfar_alloc_skb() routine. Signed-off-by: Claudiu Manoil --- drivers/net/ethernet/freescale/gianfar.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index d2c5441..af91196 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -110,7 +110,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); static void gfar_reset_task(struct work_struct *work); static void gfar_timeout(struct net_device *dev); static int gfar_close(struct net_device *dev); -struct sk_buff *gfar_new_skb(struct net_device *dev); +static struct sk_buff *gfar_alloc_skb(struct net_device *dev); static void gfar_new_rxbdp(struct gfar_priv_rx_q *rx_queue, struct rxbd8 *bdp, struct sk_buff *skb); static int gfar_set_mac_address(struct net_device *dev); @@ -207,7 +207,7 @@ static int gfar_init_bds(struct net_device *ndev) gfar_init_rxbdp(rx_queue, rxbdp, rxbdp->bufPtr); } else { - skb = gfar_new_skb(ndev); + skb = gfar_alloc_skb(ndev); if (!skb) { netdev_err(ndev, "Can't allocate RX buffers\n"); return -ENOMEM; @@ -2626,11 +2626,6 @@ static struct sk_buff *gfar_alloc_skb(struct net_device *dev) return skb; } -struct sk_buff *gfar_new_skb(struct net_device *dev) -{ - return gfar_alloc_skb(dev); -} - static inline void count_errors(unsigned short status, struct net_device *dev) { struct gfar_private *priv = netdev_priv(dev); @@ -2766,7 +2761,7 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit) rmb(); /* Add another skb for the future */ - newskb = gfar_new_skb(dev); + newskb = gfar_alloc_skb(dev); skb = rx_queue->rx_skbuff[rx_queue->skb_currx];