From patchwork Tue May 6 17:20:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 346277 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 3150A1401B0 for ; Wed, 7 May 2014 03:22:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751600AbaEFRWJ (ORCPT ); Tue, 6 May 2014 13:22:09 -0400 Received: from top.free-electrons.com ([176.31.233.9]:53569 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753796AbaEFRWG (ORCPT ); Tue, 6 May 2014 13:22:06 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 457E31243; Tue, 6 May 2014 19:22:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (unknown [190.2.108.30]) by mail.free-electrons.com (Postfix) with ESMTPSA id 486C1123F; Tue, 6 May 2014 19:22:01 +0200 (CEST) From: Ezequiel Garcia To: , "David S. Miller" , Willy Tarreau , Thomas Petazzoni Cc: Gregory Clement , Lior Amsalem , Tawfik Bayouk , Sebastian Hesselbarth , Ezequiel Garcia Subject: [PATCH v2 9/9] net: mvneta: Remove unneeded 'weigth' field Date: Tue, 6 May 2014 14:20:58 -0300 Message-Id: <1399396858-14551-10-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399396858-14551-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1399396858-14551-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The 'weight' field is only used to pass the weigth to napi initialization function. This commit removes the field, and instead uses a fixed value to initialize the napi context. Signed-off-by: Ezequiel Garcia --- drivers/net/ethernet/marvell/mvneta.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 28b0536..36fd90e 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -279,9 +279,6 @@ struct mvneta_port { u32 cause_rx_tx; struct napi_struct napi; - /* Napi weight */ - int weight; - /* Core clock */ struct clk *clk; u8 mcast_count[256]; @@ -2807,8 +2804,6 @@ static int mvneta_probe(struct platform_device *pdev) SET_ETHTOOL_OPS(dev, &mvneta_eth_tool_ops); pp = netdev_priv(dev); - - pp->weight = MVNETA_RX_POLL_WEIGHT; pp->phy_node = phy_node; pp->phy_interface = phy_mode; @@ -2869,7 +2864,7 @@ static int mvneta_probe(struct platform_device *pdev) if (dram_target_info) mvneta_conf_mbus_windows(pp, dram_target_info); - netif_napi_add(dev, &pp->napi, mvneta_poll, pp->weight); + netif_napi_add(dev, &pp->napi, mvneta_poll, MVNETA_RX_POLL_WEIGHT); dev->features = NETIF_F_SG | NETIF_F_IP_CSUM; dev->hw_features |= dev->features;