Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / e1000e / ich8lan.c

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 489bb5b..b2f2fcf 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -336,12 +336,12 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
                 */
                msleep(50);
 
-               /* fall-through */
+               fallthrough;
        case e1000_pch2lan:
                if (e1000_phy_is_accessible_pchlan(hw))
                        break;
 
-               /* fall-through */
+               fallthrough;
        case e1000_pchlan:
                if ((hw->mac.type == e1000_pchlan) &&
                    (fwsm & E1000_ICH_FWSM_FW_VALID))
@@ -457,7 +457,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
                                return ret_val;
                        if ((phy->id != 0) && (phy->id != PHY_REVISION_MASK))
                                break;
-                       /* fall-through */
+                       fallthrough;
                case e1000_pch2lan:
                case e1000_pch_lpt:
                case e1000_pch_spt:
@@ -702,7 +702,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
        case e1000_pch2lan:
                mac->rar_entry_count = E1000_PCH2_RAR_ENTRIES;
                mac->ops.rar_set = e1000_rar_set_pch2lan;
-               /* fall-through */
+               fallthrough;
        case e1000_pch_lpt:
        case e1000_pch_spt:
        case e1000_pch_cnp:
@@ -1557,7 +1557,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
                ret_val = e1000_k1_workaround_lv(hw);
                if (ret_val)
                        return ret_val;
-               /* fall-thru */
+               fallthrough;
        case e1000_pchlan:
                if (hw->phy.type == e1000_phy_82578) {
                        ret_val = e1000_link_stall_workaround_hv(hw);
@@ -2094,7 +2094,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)
                        sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG;
                        break;
                }
-               /* Fall-thru */
+               fallthrough;
        case e1000_pchlan:
        case e1000_pch2lan:
        case e1000_pch_lpt:
@@ -3187,7 +3187,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank)
                        return 0;
                }
                e_dbg("Unable to determine valid NVM bank via EEC - reading flash signature\n");
-               /* fall-thru */
+               fallthrough;
        default:
                /* set bank to 0 in case flash read fails */
                *bank = 0;