From patchwork Fri Apr 21 21:20:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Poirier X-Patchwork-Id: 753608 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 3w8pYv0q0xz9s4s for ; Sat, 22 Apr 2017 07:20:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OHS1pLg9"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161852AbdDUVUm (ORCPT ); Fri, 21 Apr 2017 17:20:42 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:34436 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161738AbdDUVUk (ORCPT ); Fri, 21 Apr 2017 17:20:40 -0400 Received: by mail-io0-f196.google.com with SMTP id h41so34537711ioi.1 for ; Fri, 21 Apr 2017 14:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=QdLhcIwuiLsFAH5n8ubo4y8JCuIOPP6FIp9aPben7D8=; b=OHS1pLg9Nki2rnz/d6ZclM3Xc5fA1AAqaVQrRi0l82RX6U1W/7fE5VZ6gwUqleYA7b HZK4l10Vz/oIXbsb+sQSx+DC6CHk5NMKSR7o46WrI7IcA4NpeQViF7In4Vk9kxKxHNj/ VP8HJ8R8+37RqWRCLNv/RWhRbdoHYqqhBQIyKJt4NjtfdZhR535fl5g6wbH+bTu7QVY4 v7m+/igFvFv2UaeA25AupyCuijfwyp6LGXwetayEk1RDUlOUECljgjCpDgPDmMULhd3n 3cNpadt7l3vzJPU0HoiAgU5R0N58hVY0Cd2M+b7j1C8m88QpRPN0JXIn/lGs8SQpaUlL pc8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=QdLhcIwuiLsFAH5n8ubo4y8JCuIOPP6FIp9aPben7D8=; b=X3as4UBFMYtE+sgRIy67PnkKrRx8DaUI5cgA+PZvxSNY9iK/xAvtdF269+qEpgA5yG 4HPcMv5S2DycoVE+5YRH67XeKKSWB6q7p8VJrSUvUtVaWSlHAmN4HYeA8MFwRam+mH8f n2wwiHTym8hK9ZDNHc1kR5jR6oDOizMSli2RH5i/6R9EB0qBSV3rQrGaSfBe1FjIhrXu TMSuDKDy9AbKEcjqRbxlbmkU0JnSUdR6a9+P8vzcYmbIqYyDyzJP+I2NB1OKUL+n2ya7 74zsjFi0lulgQE0DDUs72O5qPjPp+d1CdoZp/xRpbzc0S9qlDzINTEUjgS36UQoYz4M2 Ae4Q== X-Gm-Message-State: AN3rC/49sOYTOlgKTSS5xJ/y0eazGU+NM8kbaCFFXkYAzfJh6Bu7vE6A thvTZIiHl6A+Eg== X-Received: by 10.98.16.208 with SMTP id 77mr14123670pfq.105.1492809640002; Fri, 21 Apr 2017 14:20:40 -0700 (PDT) Received: from f1.synalogic.ca (c-73-12-236-54.hsd1.ca.comcast.net. [73.12.236.54]) by smtp.gmail.com with ESMTPSA id u8sm17658609pfk.103.2017.04.21.14.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 14:20:38 -0700 (PDT) From: Benjamin Poirier To: Jeff Kirsher Cc: Stefan Priebe , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [PATCH 2/2] igb: Remove useless argument Date: Fri, 21 Apr 2017 14:20:12 -0700 Message-Id: <20170421212012.25950-2-bpoirier@suse.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170421212012.25950-1-bpoirier@suse.com> References: <20170421212012.25950-1-bpoirier@suse.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Given that all callers of igb_update_stats() pass the same two arguments: (adapter, &adapter->stats64), the second argument can be removed. Signed-off-by: Benjamin Poirier --- drivers/net/ethernet/intel/igb/igb.h | 2 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index acbc3abe2ddd..3f0c06847fc2 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h @@ -593,7 +593,7 @@ void igb_setup_rctl(struct igb_adapter *); netdev_tx_t igb_xmit_frame_ring(struct sk_buff *, struct igb_ring *); void igb_unmap_and_free_tx_resource(struct igb_ring *, struct igb_tx_buffer *); void igb_alloc_rx_buffers(struct igb_ring *, u16); -void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *); +void igb_update_stats(struct igb_adapter *); bool igb_has_link(struct igb_adapter *adapter); void igb_set_ethtool_ops(struct net_device *); void igb_power_up_link(struct igb_adapter *); diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 737b664d004c..8c913958c2eb 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2287,7 +2287,7 @@ static void igb_get_ethtool_stats(struct net_device *netdev, char *p; spin_lock(&adapter->stats64_lock); - igb_update_stats(adapter, net_stats); + igb_update_stats(adapter); for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) { p = (char *)adapter + igb_gstrings_stats[i].stat_offset; diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index be456bae8169..20da5e9d9d3c 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -1815,7 +1815,7 @@ void igb_down(struct igb_adapter *adapter) /* record the stats before reset*/ spin_lock(&adapter->stats64_lock); - igb_update_stats(adapter, &adapter->stats64); + igb_update_stats(adapter); spin_unlock(&adapter->stats64_lock); adapter->link_speed = 0; @@ -4628,7 +4628,7 @@ static void igb_watchdog_task(struct work_struct *work) } spin_lock(&adapter->stats64_lock); - igb_update_stats(adapter, &adapter->stats64); + igb_update_stats(adapter); spin_unlock(&adapter->stats64_lock); for (i = 0; i < adapter->num_tx_queues; i++) { @@ -5410,7 +5410,7 @@ static void igb_get_stats64(struct net_device *netdev, struct igb_adapter *adapter = netdev_priv(netdev); spin_lock(&adapter->stats64_lock); - igb_update_stats(adapter, &adapter->stats64); + igb_update_stats(adapter); memcpy(stats, &adapter->stats64, sizeof(*stats)); spin_unlock(&adapter->stats64_lock); } @@ -5459,9 +5459,9 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) * igb_update_stats - Update the board statistics counters * @adapter: board private structure **/ -void igb_update_stats(struct igb_adapter *adapter, - struct rtnl_link_stats64 *net_stats) +void igb_update_stats(struct igb_adapter *adapter) { + struct rtnl_link_stats64 *net_stats = &adapter->stats64; struct e1000_hw *hw = &adapter->hw; struct pci_dev *pdev = adapter->pdev; u32 reg, mpc;