Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bb62869 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: resolve -Wunused-parameter compile warnings 



Remove the unused parameter when possible, otherwise use __always_unused
attribute.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9e019901

drivers/net/ethernet/intel/e1000e/ethtool.c

+9 −7
Original line number Original line Diff line number Diff line
@@ -418,7 +418,7 @@ static void e1000_set_msglevel(struct net_device *netdev, u32 data) 
	adapter->msg_enable = data;

	adapter->msg_enable = data;

}

}





static int e1000_get_regs_len(struct net_device *netdev)

static int e1000_get_regs_len(struct net_device __always_unused *netdev)

{

{

#define E1000_REGS_LEN 32 /* overestimate */

#define E1000_REGS_LEN 32 /* overestimate */

	return E1000_REGS_LEN * sizeof(u32);

	return E1000_REGS_LEN * sizeof(u32);
@@ -934,7 +934,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data) 
	return *data;

	return *data;

}

}





static irqreturn_t e1000_test_intr(int irq, void *data)

static irqreturn_t e1000_test_intr(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = (struct net_device *) data;

	struct net_device *netdev = (struct net_device *) data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1705,7 +1705,8 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data) 
	return *data;

	return *data;

}

}





static int e1000e_get_sset_count(struct net_device *netdev, int sset)

static int e1000e_get_sset_count(struct net_device __always_unused *netdev,

				 int sset)

{

{

	switch (sset) {

	switch (sset) {

	case ETH_SS_TEST:

	case ETH_SS_TEST:
@@ -1968,7 +1969,7 @@ static int e1000_nway_reset(struct net_device *netdev) 
}

}





static void e1000_get_ethtool_stats(struct net_device *netdev,

static void e1000_get_ethtool_stats(struct net_device *netdev,

				    struct ethtool_stats *stats,

				    struct ethtool_stats __always_unused *stats,

				    u64 *data)

				    u64 *data)

{

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1997,8 +1998,8 @@ static void e1000_get_ethtool_stats(struct net_device *netdev, 
	}

	}

}

}





static void e1000_get_strings(struct net_device *netdev, u32 stringset,

static void e1000_get_strings(struct net_device __always_unused *netdev,

			      u8 *data)

			      u32 stringset, u8 *data)

{

{

	u8 *p = data;

	u8 *p = data;

	int i;

	int i;
@@ -2018,7 +2019,8 @@ static void e1000_get_strings(struct net_device *netdev, u32 stringset, 
}

}





static int e1000_get_rxnfc(struct net_device *netdev,

static int e1000_get_rxnfc(struct net_device *netdev,

			   struct ethtool_rxnfc *info, u32 *rule_locs)

			   struct ethtool_rxnfc *info,

			   u32 __always_unused *rule_locs)

{

{

	info->data = 0;

	info->data = 0;

drivers/net/ethernet/intel/e1000e/ich8lan.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1082,7 +1082,7 @@ static DEFINE_MUTEX(nvm_mutex); 
 *

 *

 *  Acquires the mutex for performing NVM operations.

 *  Acquires the mutex for performing NVM operations.

 **/

 **/

static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw)

static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw __always_unused *hw)

{

{

	mutex_lock(&nvm_mutex);

	mutex_lock(&nvm_mutex);
@@ -1095,7 +1095,7 @@ static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw) 
 *

 *

 *  Releases the mutex used while performing NVM operations.

 *  Releases the mutex used while performing NVM operations.

 **/

 **/

static void e1000_release_nvm_ich8lan(struct e1000_hw *hw)

static void e1000_release_nvm_ich8lan(struct e1000_hw __always_unused *hw)

{

{

	mutex_unlock(&nvm_mutex);

	mutex_unlock(&nvm_mutex);

}

}

drivers/net/ethernet/intel/e1000e/mac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1356,8 +1356,8 @@ s32 e1000e_get_speed_and_duplex_copper(struct e1000_hw *hw, u16 *speed, 
 *  Sets the speed and duplex to gigabit full duplex (the only possible option)

 *  Sets the speed and duplex to gigabit full duplex (the only possible option)

 *  for fiber/serdes links.

 *  for fiber/serdes links.

 **/

 **/

s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw *hw, u16 *speed,

s32 e1000e_get_speed_and_duplex_fiber_serdes(struct e1000_hw __always_unused

					     u16 *duplex)

					     *hw, u16 *speed, u16 *duplex)

{

{

	*speed = SPEED_1000;

	*speed = SPEED_1000;

	*duplex = FULL_DUPLEX;

	*duplex = FULL_DUPLEX;

drivers/net/ethernet/intel/e1000e/netdev.c

+14 −19
Original line number Original line Diff line number Diff line
@@ -1747,7 +1747,7 @@ static void e1000e_downshift_workaround(struct work_struct *work) 
 * @irq: interrupt number

 * @irq: interrupt number

 * @data: pointer to a network interface device structure

 * @data: pointer to a network interface device structure

 **/

 **/

static irqreturn_t e1000_intr_msi(int irq, void *data)

static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1813,7 +1813,7 @@ static irqreturn_t e1000_intr_msi(int irq, void *data) 
 * @irq: interrupt number

 * @irq: interrupt number

 * @data: pointer to a network interface device structure

 * @data: pointer to a network interface device structure

 **/

 **/

static irqreturn_t e1000_intr(int irq, void *data)

static irqreturn_t e1000_intr(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1888,7 +1888,7 @@ static irqreturn_t e1000_intr(int irq, void *data) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static irqreturn_t e1000_msix_other(int irq, void *data)

static irqreturn_t e1000_msix_other(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1920,8 +1920,7 @@ static irqreturn_t e1000_msix_other(int irq, void *data) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}







static irqreturn_t e1000_intr_msix_tx(int __always_unused irq, void *data)

static irqreturn_t e1000_intr_msix_tx(int irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1939,7 +1938,7 @@ static irqreturn_t e1000_intr_msix_tx(int irq, void *data) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static irqreturn_t e1000_intr_msix_rx(int irq, void *data)

static irqreturn_t e1000_intr_msix_rx(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -2496,9 +2495,7 @@ void e1000e_free_rx_resources(struct e1000_ring *rx_ring) 
 *      while increasing bulk throughput.  This functionality is controlled

 *      while increasing bulk throughput.  This functionality is controlled

 *      by the InterruptThrottleRate module parameter.

 *      by the InterruptThrottleRate module parameter.

 **/

 **/

static unsigned int e1000_update_itr(struct e1000_adapter *adapter,

static unsigned int e1000_update_itr(u16 itr_setting, int packets, int bytes)

				     u16 itr_setting, int packets,

				     int bytes)

{

{

	unsigned int retval = itr_setting;

	unsigned int retval = itr_setting;
@@ -2558,16 +2555,14 @@ static void e1000_set_itr(struct e1000_adapter *adapter) 
		goto set_itr_now;

		goto set_itr_now;

	}

	}





	adapter->tx_itr = e1000_update_itr(adapter,

	adapter->tx_itr = e1000_update_itr(adapter->tx_itr,

				    adapter->tx_itr,

					   adapter->total_tx_packets,

					   adapter->total_tx_packets,

					   adapter->total_tx_bytes);

					   adapter->total_tx_bytes);

	/* conservative mode (itr 3) eliminates the lowest_latency setting */

	/* conservative mode (itr 3) eliminates the lowest_latency setting */

	if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)

	if (adapter->itr_setting == 3 && adapter->tx_itr == lowest_latency)

		adapter->tx_itr = low_latency;

		adapter->tx_itr = low_latency;





	adapter->rx_itr = e1000_update_itr(adapter,

	adapter->rx_itr = e1000_update_itr(adapter->rx_itr,

				    adapter->rx_itr,

					   adapter->total_rx_packets,

					   adapter->total_rx_packets,

					   adapter->total_rx_bytes);

					   adapter->total_rx_bytes);

	/* conservative mode (itr 3) eliminates the lowest_latency setting */

	/* conservative mode (itr 3) eliminates the lowest_latency setting */
@@ -4115,7 +4110,7 @@ static int e1000_sw_init(struct e1000_adapter *adapter) 
 * @irq: interrupt number

 * @irq: interrupt number

 * @data: pointer to a network interface device structure

 * @data: pointer to a network interface device structure

 **/

 **/

static irqreturn_t e1000_intr_msi_test(int irq, void *data)

static irqreturn_t e1000_intr_msi_test(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6249,7 +6244,7 @@ static void e1000_shutdown(struct pci_dev *pdev) 




#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER





static irqreturn_t e1000_intr_msix(int irq, void *data)

static irqreturn_t e1000_intr_msix(int __always_unused irq, void *data)

{

{

	struct net_device *netdev = data;

	struct net_device *netdev = data;

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

drivers/net/ethernet/intel/e1000e/phy.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2178,7 +2178,7 @@ s32 e1000e_phy_hw_reset_generic(struct e1000_hw *hw) 
 *  Generic function to wait 10 milli-seconds for configuration to complete

 *  Generic function to wait 10 milli-seconds for configuration to complete

 *  and return success.

 *  and return success.

 **/

 **/

s32 e1000e_get_cfg_done_generic(struct e1000_hw *hw)

s32 e1000e_get_cfg_done_generic(struct e1000_hw __always_unused *hw)

{

{

	mdelay(10);

	mdelay(10);