Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4097ae93 authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

e1000: remove unnecessary break after return 



Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f0a4c1d

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+0 −3
Original line number Diff line number Diff line
@@ -1316,7 +1316,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) 
	case e1000_82547:

	case e1000_82547_rev_2:

		return e1000_integrated_phy_loopback(adapter);

		break;

	default:

		/* Default PHY loopback work is to read the MII

		 * control register and assert bit 14 (loopback mode).
@@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) 
		phy_reg |= MII_CR_LOOPBACK;

		e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);

		return 0;

		break;

	}



	return 8;
@@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) 
		case e1000_82545_rev_3:

		case e1000_82546_rev_3:

			return e1000_set_phy_loopback(adapter);

			break;

		default:

			rctl = er32(RCTL);

			rctl |= E1000_RCTL_LBM_TCVR;

drivers/net/ethernet/intel/e1000/e1000_hw.c

+0 −2
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw) 
	default:

		e_dbg("Flow control param set incorrectly\n");

		return -E1000_ERR_CONFIG;

		break;

	}



	/* Since auto-negotiation is enabled, take the link out of reset (the
@@ -5041,7 +5040,6 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length, 
			break;

		default:

			return -E1000_ERR_PHY;

			break;

		}

	} else if (hw->phy_type == e1000_phy_igp) {	/* For IGP PHY */

		u16 cur_agc_value;