Skip to content

Commit

Permalink
igc: Refactor the igc_power_down_link()
Browse files Browse the repository at this point in the history
Currently the implementation of igc_power_down_link()
method was just calling igc_power_down_phy_copper_base()
method.
We can just call igc_power_down_phy_copper_base()
method directly.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Sasha Neftin authored and Jeff Kirsher committed Jun 30, 2020
1 parent 725fa16 commit a0beb3c
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions drivers/net/ethernet/intel/igc/igc_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ enum latency_range {
latency_invalid = 255
};

/**
* igc_power_down_link - Power down the phy/serdes link
* @adapter: address of board private structure
*/
static void igc_power_down_link(struct igc_adapter *adapter)
{
if (adapter->hw.phy.media_type == igc_media_type_copper)
igc_power_down_phy_copper_base(&adapter->hw);
}

void igc_reset(struct igc_adapter *adapter)
{
struct net_device *dev = adapter->netdev;
Expand Down Expand Up @@ -106,7 +96,7 @@ void igc_reset(struct igc_adapter *adapter)
igc_set_eee_i225(hw, true, true, true);

if (!netif_running(adapter->netdev))
igc_power_down_link(adapter);
igc_power_down_phy_copper_base(&adapter->hw);

/* Re-enable PTP, where applicable. */
igc_ptp_reset(adapter);
Expand Down Expand Up @@ -4615,7 +4605,7 @@ static int __igc_open(struct net_device *netdev, bool resuming)
igc_free_irq(adapter);
err_req_irq:
igc_release_hw_control(adapter);
igc_power_down_link(adapter);
igc_power_down_phy_copper_base(&adapter->hw);
igc_free_all_rx_resources(adapter);
err_setup_rx:
igc_free_all_tx_resources(adapter);
Expand Down Expand Up @@ -5313,7 +5303,7 @@ static int __igc_shutdown(struct pci_dev *pdev, bool *enable_wake,

wake = wufc || adapter->en_mng_pt;
if (!wake)
igc_power_down_link(adapter);
igc_power_down_phy_copper_base(&adapter->hw);
else
igc_power_up_link(adapter);

Expand Down

0 comments on commit a0beb3c

Please sign in to comment.