]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
igc: Remove the 'igc_read_mac_addr_base' method
authorSasha Neftin <sasha.neftin@intel.com>
Tue, 15 Jan 2019 13:21:09 +0000 (15:21 +0200)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 6 Feb 2019 01:14:38 +0000 (17:14 -0800)
Remove the redundant 'igc_read_mac_addr_base' method and use
the 'igc_read_mac_addr' method directly instead.

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>
drivers/net/ethernet/intel/igc/igc_base.c

index a31ec1682090ef3a2f03798aa8fa95571dff14f1..51a667c16dea8f52e5d76213386e6b2603816b28 100644 (file)
@@ -371,19 +371,6 @@ static s32 igc_init_hw_base(struct igc_hw *hw)
        return ret_val;
 }
 
-/**
- * igc_read_mac_addr_base - Read device MAC address
- * @hw: pointer to the HW structure
- */
-static s32 igc_read_mac_addr_base(struct igc_hw *hw)
-{
-       s32 ret_val = 0;
-
-       ret_val = igc_read_mac_addr(hw);
-
-       return ret_val;
-}
-
 /**
  * igc_power_down_phy_copper_base - Remove link during PHY power down
  * @hw: pointer to the HW structure
@@ -478,7 +465,7 @@ static struct igc_mac_operations igc_mac_ops_base = {
        .init_hw                = igc_init_hw_base,
        .check_for_link         = igc_check_for_copper_link,
        .rar_set                = igc_rar_set,
-       .read_mac_addr          = igc_read_mac_addr_base,
+       .read_mac_addr          = igc_read_mac_addr,
        .get_speed_and_duplex   = igc_get_speed_and_duplex_copper,
 };