Commit 461359c4 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Nguyen

igb: Remove redundant runtime resume for ethtool_ops

749ab2cd ("igb: add basic runtime PM support") added
ethtool_ops.begin() and .complete(), which used pm_runtime_get_sync() to
resume suspended devices before any ethtool_ops callback and allow suspend
after it completed.

Subsequently, f32a2137 ("ethtool: runtime-resume netdev parent before
ethtool ioctl ops") added pm_runtime_get_sync() in the dev_ethtool() path,
so the device is resumed before any ethtool_ops callback even if the driver
didn't supply a .begin() callback.

Remove the .begin() and .complete() callbacks, which are now redundant
because dev_ethtool() already resumes the device.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent b2c28941
...@@ -3272,19 +3272,6 @@ static int igb_get_module_eeprom(struct net_device *netdev, ...@@ -3272,19 +3272,6 @@ static int igb_get_module_eeprom(struct net_device *netdev,
return 0; return 0;
} }
static int igb_ethtool_begin(struct net_device *netdev)
{
struct igb_adapter *adapter = netdev_priv(netdev);
pm_runtime_get_sync(&adapter->pdev->dev);
return 0;
}
static void igb_ethtool_complete(struct net_device *netdev)
{
struct igb_adapter *adapter = netdev_priv(netdev);
pm_runtime_put(&adapter->pdev->dev);
}
static u32 igb_get_rxfh_indir_size(struct net_device *netdev) static u32 igb_get_rxfh_indir_size(struct net_device *netdev)
{ {
return IGB_RETA_SIZE; return IGB_RETA_SIZE;
...@@ -3508,8 +3495,6 @@ static const struct ethtool_ops igb_ethtool_ops = { ...@@ -3508,8 +3495,6 @@ static const struct ethtool_ops igb_ethtool_ops = {
.set_channels = igb_set_channels, .set_channels = igb_set_channels,
.get_priv_flags = igb_get_priv_flags, .get_priv_flags = igb_get_priv_flags,
.set_priv_flags = igb_set_priv_flags, .set_priv_flags = igb_set_priv_flags,
.begin = igb_ethtool_begin,
.complete = igb_ethtool_complete,
.get_link_ksettings = igb_get_link_ksettings, .get_link_ksettings = igb_get_link_ksettings,
.set_link_ksettings = igb_set_link_ksettings, .set_link_ksettings = igb_set_link_ksettings,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment