igb: Remove redundant runtime resume for ethtool_ops

749ab2cd1270 ("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, f32a21376573 ("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: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 99977a22b8430588dbbfaba03e27209546e64eab..61d72250c0ed070e83170ddd6f076fcf4bf2a8be 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -3272,19 +3272,6 @@ static int igb_get_module_eeprom(struct net_device *netdev,
        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)
 {
        return IGB_RETA_SIZE;
@@ -3508,8 +3495,6 @@ static const struct ethtool_ops igb_ethtool_ops = {
        .set_channels           = igb_set_channels,
        .get_priv_flags         = igb_get_priv_flags,
        .set_priv_flags         = igb_set_priv_flags,
-       .begin                  = igb_ethtool_begin,
-       .complete               = igb_ethtool_complete,
        .get_link_ksettings     = igb_get_link_ksettings,
        .set_link_ksettings     = igb_set_link_ksettings,
 };