diff options
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_82575.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 3 | ||||
-rw-r--r-- | drivers/net/slip/slhc.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wcn36xx/main.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 1 |
11 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c index 0d74b46d177f..4627588f4613 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | |||
@@ -417,7 +417,6 @@ static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw, | |||
417 | default: | 417 | default: |
418 | ret_code = I40E_ERR_INVALID_SD_TYPE; | 418 | ret_code = I40E_ERR_INVALID_SD_TYPE; |
419 | goto exit; | 419 | goto exit; |
420 | break; | ||
421 | } | 420 | } |
422 | } | 421 | } |
423 | } | 422 | } |
@@ -502,7 +501,6 @@ try_type_paged: | |||
502 | hw_dbg(hw, "i40e_configure_lan_hmc: Unknown SD type: %d\n", | 501 | hw_dbg(hw, "i40e_configure_lan_hmc: Unknown SD type: %d\n", |
503 | ret_code); | 502 | ret_code); |
504 | goto configure_lan_hmc_out; | 503 | goto configure_lan_hmc_out; |
505 | break; | ||
506 | } | 504 | } |
507 | 505 | ||
508 | /* Configure and program the FPM registers so objects can be created */ | 506 | /* Configure and program the FPM registers so objects can be created */ |
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 1b980fb88cdd..ed1eb1230522 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c | |||
@@ -2013,7 +2013,6 @@ static void i40evf_init_task(struct work_struct *work) | |||
2013 | } | 2013 | } |
2014 | adapter->state = __I40EVF_INIT_VERSION_CHECK; | 2014 | adapter->state = __I40EVF_INIT_VERSION_CHECK; |
2015 | goto restart; | 2015 | goto restart; |
2016 | break; | ||
2017 | case __I40EVF_INIT_VERSION_CHECK: | 2016 | case __I40EVF_INIT_VERSION_CHECK: |
2018 | if (!i40evf_asq_done(hw)) { | 2017 | if (!i40evf_asq_done(hw)) { |
2019 | dev_err(&pdev->dev, "Admin queue command never completed\n"); | 2018 | dev_err(&pdev->dev, "Admin queue command never completed\n"); |
@@ -2039,7 +2038,6 @@ static void i40evf_init_task(struct work_struct *work) | |||
2039 | } | 2038 | } |
2040 | adapter->state = __I40EVF_INIT_GET_RESOURCES; | 2039 | adapter->state = __I40EVF_INIT_GET_RESOURCES; |
2041 | goto restart; | 2040 | goto restart; |
2042 | break; | ||
2043 | case __I40EVF_INIT_GET_RESOURCES: | 2041 | case __I40EVF_INIT_GET_RESOURCES: |
2044 | /* aq msg sent, awaiting reply */ | 2042 | /* aq msg sent, awaiting reply */ |
2045 | if (!adapter->vf_res) { | 2043 | if (!adapter->vf_res) { |
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index a2db388cc31e..168a5ee5e0ba 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c | |||
@@ -837,7 +837,6 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw) | |||
837 | default: | 837 | default: |
838 | ret_val = -E1000_ERR_PHY; | 838 | ret_val = -E1000_ERR_PHY; |
839 | goto out; | 839 | goto out; |
840 | break; | ||
841 | } | 840 | } |
842 | ret_val = igb_get_phy_id(hw); | 841 | ret_val = igb_get_phy_id(hw); |
843 | goto out; | 842 | goto out; |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c index 15609331ec17..206171f732fb 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | |||
@@ -430,7 +430,6 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) | |||
430 | hw_dbg(hw, "Flow control param set incorrectly\n"); | 430 | hw_dbg(hw, "Flow control param set incorrectly\n"); |
431 | ret_val = IXGBE_ERR_CONFIG; | 431 | ret_val = IXGBE_ERR_CONFIG; |
432 | goto out; | 432 | goto out; |
433 | break; | ||
434 | } | 433 | } |
435 | 434 | ||
436 | /* Set 802.3x based flow control settings. */ | 435 | /* Set 802.3x based flow control settings. */ |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index bc7c924240a5..0373a5b9219f 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | |||
@@ -432,7 +432,6 @@ static s32 ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, | |||
432 | default: | 432 | default: |
433 | status = IXGBE_ERR_LINK_SETUP; | 433 | status = IXGBE_ERR_LINK_SETUP; |
434 | goto out; | 434 | goto out; |
435 | break; | ||
436 | } | 435 | } |
437 | 436 | ||
438 | if (hw->phy.multispeed_fiber) { | 437 | if (hw->phy.multispeed_fiber) { |
@@ -2035,7 +2034,6 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) | |||
2035 | else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI) | 2034 | else if (pma_pmd_10g_parallel == IXGBE_AUTOC_10G_XAUI) |
2036 | physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI; | 2035 | physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_XAUI; |
2037 | goto out; | 2036 | goto out; |
2038 | break; | ||
2039 | case IXGBE_AUTOC_LMS_10G_SERIAL: | 2037 | case IXGBE_AUTOC_LMS_10G_SERIAL: |
2040 | if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) { | 2038 | if (pma_pmd_10g_serial == IXGBE_AUTOC2_10G_KR) { |
2041 | physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR; | 2039 | physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_KR; |
@@ -2052,10 +2050,8 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw) | |||
2052 | if (autoc & IXGBE_AUTOC_KR_SUPP) | 2050 | if (autoc & IXGBE_AUTOC_KR_SUPP) |
2053 | physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR; | 2051 | physical_layer |= IXGBE_PHYSICAL_LAYER_10GBASE_KR; |
2054 | goto out; | 2052 | goto out; |
2055 | break; | ||
2056 | default: | 2053 | default: |
2057 | goto out; | 2054 | goto out; |
2058 | break; | ||
2059 | } | 2055 | } |
2060 | 2056 | ||
2061 | sfp_check: | 2057 | sfp_check: |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c index 4e5385a2a465..3f318c52e053 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | |||
@@ -216,7 +216,6 @@ static s32 ixgbe_setup_fc(struct ixgbe_hw *hw) | |||
216 | hw_dbg(hw, "Flow control param set incorrectly\n"); | 216 | hw_dbg(hw, "Flow control param set incorrectly\n"); |
217 | ret_val = IXGBE_ERR_CONFIG; | 217 | ret_val = IXGBE_ERR_CONFIG; |
218 | goto out; | 218 | goto out; |
219 | break; | ||
220 | } | 219 | } |
221 | 220 | ||
222 | if (hw->mac.type != ixgbe_mac_X540) { | 221 | if (hw->mac.type != ixgbe_mac_X540) { |
@@ -2179,7 +2178,6 @@ s32 ixgbe_fc_enable_generic(struct ixgbe_hw *hw) | |||
2179 | hw_dbg(hw, "Flow control param set incorrectly\n"); | 2178 | hw_dbg(hw, "Flow control param set incorrectly\n"); |
2180 | ret_val = IXGBE_ERR_CONFIG; | 2179 | ret_val = IXGBE_ERR_CONFIG; |
2181 | goto out; | 2180 | goto out; |
2182 | break; | ||
2183 | } | 2181 | } |
2184 | 2182 | ||
2185 | /* Set 802.3x based flow control settings. */ | 2183 | /* Set 802.3x based flow control settings. */ |
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c index d568af1eb4f4..2553ed5d2ece 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | |||
@@ -723,13 +723,10 @@ static int gelic_wl_get_scan(struct net_device *netdev, | |||
723 | /* If a scan in progress, caller should call me again */ | 723 | /* If a scan in progress, caller should call me again */ |
724 | ret = -EAGAIN; | 724 | ret = -EAGAIN; |
725 | goto out; | 725 | goto out; |
726 | break; | ||
727 | |||
728 | case GELIC_WL_SCAN_STAT_INIT: | 726 | case GELIC_WL_SCAN_STAT_INIT: |
729 | /* last scan request failed or never issued */ | 727 | /* last scan request failed or never issued */ |
730 | ret = -ENODEV; | 728 | ret = -ENODEV; |
731 | goto out; | 729 | goto out; |
732 | break; | ||
733 | case GELIC_WL_SCAN_STAT_GOT_LIST: | 730 | case GELIC_WL_SCAN_STAT_GOT_LIST: |
734 | /* ok, use current list */ | 731 | /* ok, use current list */ |
735 | break; | 732 | break; |
diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c index 1252d9c726a7..079f7adfcde5 100644 --- a/drivers/net/slip/slhc.c +++ b/drivers/net/slip/slhc.c | |||
@@ -396,7 +396,6 @@ found: | |||
396 | ntohs(cs->cs_ip.tot_len) == hlen) | 396 | ntohs(cs->cs_ip.tot_len) == hlen) |
397 | break; | 397 | break; |
398 | goto uncompressed; | 398 | goto uncompressed; |
399 | break; | ||
400 | case SPECIAL_I: | 399 | case SPECIAL_I: |
401 | case SPECIAL_D: | 400 | case SPECIAL_D: |
402 | /* actual changes match one of our special case encodings -- | 401 | /* actual changes match one of our special case encodings -- |
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 4ab5370ab7a6..b71d2b33532d 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c | |||
@@ -488,7 +488,6 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
488 | wcn36xx_err("Unsupported key cmd 0x%x\n", cmd); | 488 | wcn36xx_err("Unsupported key cmd 0x%x\n", cmd); |
489 | ret = -EOPNOTSUPP; | 489 | ret = -EOPNOTSUPP; |
490 | goto out; | 490 | goto out; |
491 | break; | ||
492 | } | 491 | } |
493 | 492 | ||
494 | out: | 493 | out: |
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index c90939ced0e4..d3cf7c3ebfd6 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c | |||
@@ -921,7 +921,6 @@ static int ezusb_access_ltv(struct ezusb_priv *upriv, | |||
921 | retval = -EFAULT; | 921 | retval = -EFAULT; |
922 | } | 922 | } |
923 | goto exit; | 923 | goto exit; |
924 | break; | ||
925 | } | 924 | } |
926 | if (ctx->in_rid) { | 925 | if (ctx->in_rid) { |
927 | struct ezusb_packet *ans = ctx->buf; | 926 | struct ezusb_packet *ans = ctx->buf; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c index 380e7d4b1ccf..73fa4a1de4df 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c | |||
@@ -438,7 +438,6 @@ int rtl92s_download_fw(struct ieee80211_hw *hw) | |||
438 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 438 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
439 | "Unexpected Download step!!\n"); | 439 | "Unexpected Download step!!\n"); |
440 | goto fail; | 440 | goto fail; |
441 | break; | ||
442 | } | 441 | } |
443 | 442 | ||
444 | /* <2> Download image file */ | 443 | /* <2> Download image file */ |