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: David S. Miller <davem@davemloft.net>
This commit is contained in:
Коммит
39b1c29b7b
|
@ -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 */
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -216,7 +216,6 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw)
|
|||
hw_dbg(hw, "Flow control param set incorrectly\n");
|
||||
ret_val = IXGBE_ERR_CONFIG;
|
||||
goto out;
|
||||
break;
|
||||
}
|
||||
|
||||
if (hw->mac.type != ixgbe_mac_X540) {
|
||||
|
@ -2179,7 +2178,6 @@ s32 ixgbe_fc_enable_generic(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. */
|
||||
|
|
|
@ -723,13 +723,10 @@ static int gelic_wl_get_scan(struct net_device *netdev,
|
|||
/* If a scan in progress, caller should call me again */
|
||||
ret = -EAGAIN;
|
||||
goto out;
|
||||
break;
|
||||
|
||||
case GELIC_WL_SCAN_STAT_INIT:
|
||||
/* last scan request failed or never issued */
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
break;
|
||||
case GELIC_WL_SCAN_STAT_GOT_LIST:
|
||||
/* ok, use current list */
|
||||
break;
|
||||
|
|
|
@ -396,7 +396,6 @@ found:
|
|||
ntohs(cs->cs_ip.tot_len) == hlen)
|
||||
break;
|
||||
goto uncompressed;
|
||||
break;
|
||||
case SPECIAL_I:
|
||||
case SPECIAL_D:
|
||||
/* actual changes match one of our special case encodings --
|
||||
|
|
|
@ -488,7 +488,6 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
|||
wcn36xx_err("Unsupported key cmd 0x%x\n", cmd);
|
||||
ret = -EOPNOTSUPP;
|
||||
goto out;
|
||||
break;
|
||||
}
|
||||
|
||||
out:
|
||||
|
|
|
@ -921,7 +921,6 @@ static int ezusb_access_ltv(struct ezusb_priv *upriv,
|
|||
retval = -EFAULT;
|
||||
}
|
||||
goto exit;
|
||||
break;
|
||||
}
|
||||
if (ctx->in_rid) {
|
||||
struct ezusb_packet *ans = ctx->buf;
|
||||
|
|
|
@ -438,7 +438,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
|
|||
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
||||
"Unexpected Download step!!\n");
|
||||
goto fail;
|
||||
break;
|
||||
}
|
||||
|
||||
/* <2> Download image file */
|
||||
|
|
Загрузка…
Ссылка в новой задаче