igb: Remove useless argument
Subsystems (2)
PATCH v2 1/1 igb: Remove useless argument
From: Benjamin Poirier <[email protected]>
Given that all callers of igb_update_stats() pass the same two arguments:
(adapter, &adapter->stats64), the second argument can be removed.
--- 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(-)
drivers/net/ethernet/intel/igb/igb.h +1 -1
@@ -667,7 +667,7 @@ void igb_setup_tctl(struct igb_adapter *);void igb_setup_rctl (struct igb_adapter *);netdev_tx_t igb_xmit_frame_ring (struct sk_buff *,struct igb_ring *);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 *);
drivers/net/ethernet/intel/igb/igb_ethtool.c +1 -1
@@ -2316,7 +2316,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;
drivers/net/ethernet/intel/igb/igb_main.c +5 -5
@@ -1818,7 +1818,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 ;
@@ -4686,7 +4686,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++) {
@@ -5499,7 +5499,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); }
@@ -5548,9 +5548,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;
Brown
PATCH v2 1/1 igb: Remove useless argument
Quoted 12 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jeff Kirsher
Sent: Tuesday, May 16, 2017 3:55 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Benjamin Poirier <[email protected]>
Subject: [Intel-wired-lan] [next-queue v2] igb: Remove useless argumentFrom: Benjamin Poirier <[email protected]>
Given that all callers of
igb_update_stats()pass the same two arguments:
(adapter,&adapter->stats64), the second argument can be removed.
Quoted 7 lines
Signed-off-by Benjamin Poirier <[email protected]>--- 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(-)
I'm getting a warning from checkpatch with this:
------------------------------------------------------------
WARNING: function definition argument 'struct igb_adapter *' should also have an identifier name #25: FILE: drivers/net/ethernet/intel/igb/igb.h:670:
+void igb_update_stats(struct igb_adapter *);
total: 0 errors, 1 warnings, 0 checks, 51 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
Your patch has style problems, please review.
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
u1515:[2]/usr/src/kernels/next-queue>
------------------------------------------------------------
But it otherwise seems fine so I'm not inclined to hold it up for that.