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

Commit 39b1c29b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'unnecessary_break' 



Fabian Frederick says:

====================
drivers/net: remove unnecessary break after goto

Small patchset addressing break redundancy on drivers/net branch
(suggested by Joe Perches).

V2: cc to maintainers of each section.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ec31a05c 8904120b

drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c

+0 −2
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw, 
			default:

				ret_code = I40E_ERR_INVALID_SD_TYPE;

				goto exit;

				break;

			}

		}

	}
@@ -502,7 +501,6 @@ try_type_paged: 
		hw_dbg(hw, "i40e_configure_lan_hmc: Unknown SD type: %d\n",

			  ret_code);

		goto configure_lan_hmc_out;

		break;

	}



	/* Configure and program the FPM registers so objects can be created */

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2013,7 +2013,6 @@ static void i40evf_init_task(struct work_struct *work) 
		}

		adapter->state = __I40EVF_INIT_VERSION_CHECK;

		goto restart;

		break;

	case __I40EVF_INIT_VERSION_CHECK:

		if (!i40evf_asq_done(hw)) {

			dev_err(&pdev->dev, "Admin queue command never completed\n");
@@ -2039,7 +2038,6 @@ static void i40evf_init_task(struct work_struct *work) 
		}

		adapter->state = __I40EVF_INIT_GET_RESOURCES;

		goto restart;

		break;

	case __I40EVF_INIT_GET_RESOURCES:

		/* aq msg sent, awaiting reply */

		if (!adapter->vf_res) {

drivers/net/ethernet/intel/igb/e1000_82575.c

+0 −1
Original line number Diff line number Diff line
@@ -837,7 +837,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;

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+0 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 
		hw_dbg(hw, "Flow control param set incorrectly\n");

		ret_val = IXGBE_ERR_CONFIG;

		goto out;

		break;

	}



	/* Set 802.3x based flow control settings. */

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+0 −4
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, 
	default:

		status = IXGBE_ERR_LINK_SETUP;

		goto out;

		break;

	}



	if (hw->phy.multispeed_fiber) {
@@ -2035,7 +2034,6 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 
		else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)

			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;

		goto out;

		break;

	case IXGBE_AUTOC_LMS_10G_SERIAL:

		if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {

			physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR;
@@ -2052,10 +2050,8 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) 
		if (autoc & IXGBE_AUTOC_KR_SUPP)

			physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;

		goto out;

		break;

	default:

		goto out;

		break;

	}



sfp_check: