From patchwork Fri Oct 15 12:15:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 67937 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 38CF0B70E5 for ; Fri, 15 Oct 2010 23:13:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768Ab0JOMNJ (ORCPT ); Fri, 15 Oct 2010 08:13:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59576 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676Ab0JOMNH (ORCPT ); Fri, 15 Oct 2010 08:13:07 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9FCCx8f004596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Oct 2010 08:12:59 -0400 Received: from localhost (dhcp-1-246.brq.redhat.com [10.34.1.246]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9FCCwh5026215; Fri, 15 Oct 2010 08:12:58 -0400 From: Stanislaw Gruszka To: Francois Romieu , netdev@vger.kernel.org Cc: Denis Kirjanov , Stanislaw Gruszka Subject: [PATCH 2/6] r8169: reduce number of functions arguments Date: Fri, 15 Oct 2010 14:15:18 +0200 Message-Id: <1287144922-3297-2-git-send-email-sgruszka@redhat.com> In-Reply-To: <1287144922-3297-1-git-send-email-sgruszka@redhat.com> References: <1287144922-3297-1-git-send-email-sgruszka@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We don't need to pass arguments on stack since we have them in per device private structure. Signed-off-by: Stanislaw Gruszka --- drivers/net/r8169.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a6c4f90..86be06c 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4005,29 +4005,26 @@ static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping, rtl8169_mark_to_asic(desc, rx_buf_sz); } -static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev, - struct net_device *dev, - struct RxDesc *desc, int rx_buf_sz, - unsigned int align, gfp_t gfp) +static struct sk_buff *rtl8169_alloc_rx_skb(struct rtl8169_private *tp, + struct RxDesc *desc, gfp_t gfp) { struct sk_buff *skb; dma_addr_t mapping; - unsigned int pad; + unsigned int align = tp->align; + unsigned int pad = align ? align : NET_IP_ALIGN; - pad = align ? align : NET_IP_ALIGN; - - skb = __netdev_alloc_skb(dev, rx_buf_sz + pad, gfp); + skb = __netdev_alloc_skb(tp->dev, tp->rx_buf_sz + pad, gfp); if (!skb) goto err_out_0; skb_reserve(skb, align ? ((pad - 1) & (unsigned long)skb->data) : pad); - mapping = dma_map_single(&pdev->dev, skb->data, rx_buf_sz, + mapping = dma_map_single(&tp->pci_dev->dev, skb->data, tp->rx_buf_sz, PCI_DMA_FROMDEVICE); - if (dma_mapping_error(&pdev->dev, mapping)) + if (dma_mapping_error(&tp->pci_dev->dev, mapping)) goto err_free_skb_1; - rtl8169_map_to_asic(desc, mapping, rx_buf_sz); + rtl8169_map_to_asic(desc, mapping, tp->rx_buf_sz); return skb; @@ -4051,8 +4048,7 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp) } } -static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev, - u32 start, u32 end, gfp_t gfp) +static u32 rtl8169_rx_fill(struct rtl8169_private *tp, u32 start, u32 end, gfp_t gfp) { u32 cur; @@ -4065,9 +4061,7 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev, if (tp->Rx_skbuff[i]) continue; - skb = rtl8169_alloc_rx_skb(tp->pci_dev, dev, - tp->RxDescArray + i, - tp->rx_buf_sz, tp->align, gfp); + skb = rtl8169_alloc_rx_skb(tp, tp->RxDescArray + i, gfp); if (!skb) break; @@ -4095,7 +4089,7 @@ static int rtl8169_init_ring(struct net_device *dev) memset(tp->tx_skb, 0x0, NUM_TX_DESC * sizeof(struct ring_info)); memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *)); - if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC, GFP_KERNEL) != NUM_RX_DESC) + if (rtl8169_rx_fill(tp, 0, NUM_RX_DESC, GFP_KERNEL) != NUM_RX_DESC) goto err_out; rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1); @@ -4615,7 +4609,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, count = cur_rx - tp->cur_rx; tp->cur_rx = cur_rx; - delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx, GFP_ATOMIC); + delta = rtl8169_rx_fill(tp, tp->dirty_rx, tp->cur_rx, GFP_ATOMIC); if (!delta && count) netif_info(tp, intr, dev, "no Rx buffer allocated\n"); tp->dirty_rx += delta;