UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
David S. Miller 2014-07-13 23:45:55 -07:00
parent ec31a05c4d 8904120b52
commit 39b1c29b7b
11 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c
View File

@ -417,7 +417,6 @@ static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw,
default: default:
ret_code = I40E_ERR_INVALID_SD_TYPE; ret_code = I40E_ERR_INVALID_SD_TYPE;
goto exit; goto exit;
break;
} }
} }
} }
@ -502,7 +501,6 @@ try_type_paged:
hw_dbg(hw, "i40e_configure_lan_hmc: Unknown SD type: %d\n", hw_dbg(hw, "i40e_configure_lan_hmc: Unknown SD type: %d\n",
ret_code); ret_code);
goto configure_lan_hmc_out; goto configure_lan_hmc_out;
break;
} }
/* Configure and program the FPM registers so objects can be created */ /* Configure and program the FPM registers so objects can be created */

2
drivers/net/ethernet/intel/i40evf/i40evf_main.c
View File

@ -2013,7 +2013,6 @@ static void i40evf_init_task(struct work_struct *work)
} }
adapter->state = __I40EVF_INIT_VERSION_CHECK; adapter->state = __I40EVF_INIT_VERSION_CHECK;
goto restart; goto restart;
break;
case __I40EVF_INIT_VERSION_CHECK: case __I40EVF_INIT_VERSION_CHECK:
if (!i40evf_asq_done(hw)) { if (!i40evf_asq_done(hw)) {
dev_err(&pdev->dev, "Admin queue command never completed\n"); 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; adapter->state = __I40EVF_INIT_GET_RESOURCES;
goto restart; goto restart;
break;
case __I40EVF_INIT_GET_RESOURCES: case __I40EVF_INIT_GET_RESOURCES:
/* aq msg sent, awaiting reply */ /* aq msg sent, awaiting reply */
if (!adapter->vf_res) { if (!adapter->vf_res) {

1
drivers/net/ethernet/intel/igb/e1000_82575.c
View File

@ -837,7 +837,6 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
default: default:
ret_val = -E1000_ERR_PHY; ret_val = -E1000_ERR_PHY;
goto out; goto out;
break;
} }
ret_val = igb_get_phy_id(hw); ret_val = igb_get_phy_id(hw);
goto out; goto out;

1
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c
View File

@ -430,7 +430,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw)
hw_dbg(hw, "Flow control param set incorrectly\n"); hw_dbg(hw, "Flow control param set incorrectly\n");
ret_val = IXGBE_ERR_CONFIG; ret_val = IXGBE_ERR_CONFIG;
goto out; goto out;
break;
} }
/* Set 802.3x based flow control settings. */ /* Set 802.3x based flow control settings. */

4
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c
View File

@ -432,7 +432,6 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw,
default: default:
status = IXGBE_ERR_LINK_SETUP; status = IXGBE_ERR_LINK_SETUP;
goto out; goto out;
break;
} }
if (hw->phy.multispeed_fiber) { 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) else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI)
physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI; physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI;
goto out; goto out;
break;
case IXGBE_AUTOC_LMS_10G_SERIAL: case IXGBE_AUTOC_LMS_10G_SERIAL:
if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) { if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) {
physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_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) if (autoc & IXGBE_AUTOC_KR_SUPP)
physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR; physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR;
goto out; goto out;
break;
default: default:
goto out; goto out;
break;
} }
sfp_check: sfp_check:

2
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
View File

@ -216,7 +216,6 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw)
hw_dbg(hw, "Flow control param set incorrectly\n"); hw_dbg(hw, "Flow control param set incorrectly\n");
ret_val = IXGBE_ERR_CONFIG; ret_val = IXGBE_ERR_CONFIG;
goto out; goto out;
break;
} }
if (hw->mac.type != ixgbe_mac_X540) { 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"); hw_dbg(hw, "Flow control param set incorrectly\n");
ret_val = IXGBE_ERR_CONFIG; ret_val = IXGBE_ERR_CONFIG;
goto out; goto out;
break;
} }
/* Set 802.3x based flow control settings. */ /* Set 802.3x based flow control settings. */

3
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
View File

@ -723,13 +723,10 @@ static int gelic_wl_get_scan(struct net_device *netdev,
/* If a scan in progress, caller should call me again */ /* If a scan in progress, caller should call me again */
ret = -EAGAIN; ret = -EAGAIN;
goto out; goto out;
break;
case GELIC_WL_SCAN_STAT_INIT: case GELIC_WL_SCAN_STAT_INIT:
/* last scan request failed or never issued */ /* last scan request failed or never issued */
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
break;
case GELIC_WL_SCAN_STAT_GOT_LIST: case GELIC_WL_SCAN_STAT_GOT_LIST:
/* ok, use current list */ /* ok, use current list */
break; break;

1
drivers/net/slip/slhc.c
View File

@ -396,7 +396,6 @@ found:
ntohs(cs->cs_ip.tot_len) == hlen) ntohs(cs->cs_ip.tot_len) == hlen)
break; break;
goto uncompressed; goto uncompressed;
break;
case SPECIAL_I: case SPECIAL_I:
case SPECIAL_D: case SPECIAL_D:
/* actual changes match one of our special case encodings -- /* actual changes match one of our special case encodings --

1
drivers/net/wireless/ath/wcn36xx/main.c
View File

@ -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); wcn36xx_err("Unsupported key cmd 0x%x\n", cmd);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto out; goto out;
break;
} }
out: out:

1
drivers/net/wireless/orinoco/orinoco_usb.c
View File

@ -921,7 +921,6 @@ static int ezusb_access_ltv(struct ezusb_priv *upriv,
retval = -EFAULT; retval = -EFAULT;
} }
goto exit; goto exit;
break;
} }
if (ctx->in_rid) { if (ctx->in_rid) {
struct ezusb_packet *ans = ctx->buf; struct ezusb_packet *ans = ctx->buf;

1
drivers/net/wireless/rtlwifi/rtl8192se/fw.c
View File

@ -438,7 +438,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw)
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
"Unexpected Download step!!\n"); "Unexpected Download step!!\n");
goto fail; goto fail;
break;
} }
/* <2> Download image file */ /* <2> Download image file */