Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / igb / e1000_82575.c

diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index ee74f9536b31b9d71471a351d7b8ad96c375da41..236a6183a86523a3aef0430b3a575081b32ba7b5 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -579,7 +579,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                break;
        default:
                return -E1000_ERR_MAC_INIT;
-               break;
        }
 
        /* Set media type */
@@ -837,7 +836,6 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
                default:
                        ret_val = -E1000_ERR_PHY;
                        goto out;
-                       break;
                }
                ret_val = igb_get_phy_id(hw);
                goto out;