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

Commit 4145ce0f authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

e1000e: 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 bc80d0d5

drivers/net/ethernet/intel/e1000e/82571.c

+0 −4
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw) 
		break;

	default:

		return -E1000_ERR_PHY;

		break;

	}



	/* This can only be done after all function pointers are setup. */
@@ -422,7 +421,6 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw) 
		break;

	case e1000_82573:

		return e1000e_get_phy_id(hw);

		break;

	case e1000_82574:

	case e1000_82583:

		ret_val = e1e_rphy(hw, MII_PHYSID1, &phy_id);
@@ -440,7 +438,6 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw) 
		break;

	default:

		return -E1000_ERR_PHY;

		break;

	}



	return 0;
@@ -1458,7 +1455,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw) 
		break;

	default:

		return -E1000_ERR_PHY;

		break;

	}



	if (ret_val)

drivers/net/ethernet/intel/e1000e/ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -1521,11 +1521,9 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) 
		switch (hw->mac.type) {

		case e1000_80003es2lan:

			return e1000_set_es2lan_mac_loopback(adapter);

			break;

		case e1000_82571:

		case e1000_82572:

			return e1000_set_82571_fiber_loopback(adapter);

			break;

		default:

			rctl = er32(RCTL);

			rctl |= E1000_RCTL_LBM_TCVR;

drivers/net/ethernet/intel/e1000e/ich8lan.c

+0 −1
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw) 
		break;

	default:

		return -E1000_ERR_PHY;

		break;

	}



	return 0;

drivers/net/ethernet/intel/e1000e/mac.c

+0 −1
Original line number Diff line number Diff line
@@ -787,7 +787,6 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw) 
	default:

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

		return -E1000_ERR_CONFIG;

		break;

	}



	ew32(TXCW, txcw);