]> git.dujemihanovic.xyz Git - linux.git/commitdiff
igc: Remove phy->type checking
authorSasha Neftin <sasha.neftin@intel.com>
Sat, 10 Jul 2021 17:57:50 +0000 (20:57 +0300)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 20 Jul 2021 23:11:36 +0000 (16:11 -0700)
i225 devices have only one phy->type: copper. There is no point checking
phy->type during the igc_has_link method from the watchdog that
invoked every 2 seconds.
This patch comes to clean up these pointless checkings.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/igc/igc_main.c

index a5278a8f491fb7865ed656f7c25f8f92a2bbff43..31e489ed3f8d543e31badf303b876276b9c251bc 100644 (file)
@@ -5219,17 +5219,10 @@ bool igc_has_link(struct igc_adapter *adapter)
         * false until the igc_check_for_link establishes link
         * for copper adapters ONLY
         */
-       switch (hw->phy.media_type) {
-       case igc_media_type_copper:
-               if (!hw->mac.get_link_status)
-                       return true;
-               hw->mac.ops.check_for_link(hw);
-               link_active = !hw->mac.get_link_status;
-               break;
-       default:
-       case igc_media_type_unknown:
-               break;
-       }
+       if (!hw->mac.get_link_status)
+               return true;
+       hw->mac.ops.check_for_link(hw);
+       link_active = !hw->mac.get_link_status;
 
        if (hw->mac.type == igc_i225) {
                if (!netif_carrier_ok(adapter->netdev)) {