diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2011-12-15 19:46:54 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-01-26 21:30:39 -0500 |
commit | 434f1392ae3a3934a33d2d16987d857c97951c3d (patch) | |
tree | 16b75ddfb22d5f82587761e581694cf7a9a94591 /drivers/net | |
parent | 464c85e37e6b2d2ad4f3bea23a59408c5595db15 (diff) |
e1000e: concatenate long debug strings which span multiple lines
To ease searching for debug message strings, concatenate strings that span
multiple lines even if the resulting line exceeds 80 columns; these will
not cause checkpatch warnings.
Also, add '\n' and remove unnecessary '\r' from a few debug strings.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/ich8lan.c | 15 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/lib.c | 20 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c | 3 |
4 files changed, 15 insertions, 26 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index b3a235c8ed85..f323ce507f58 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c | |||
@@ -667,8 +667,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw) | |||
667 | udelay(1); | 667 | udelay(1); |
668 | 668 | ||
669 | if (hw->phy.autoneg_wait_to_complete) { | 669 | if (hw->phy.autoneg_wait_to_complete) { |
670 | e_dbg("Waiting for forced speed/duplex link " | 670 | e_dbg("Waiting for forced speed/duplex link on GG82563 phy.\n"); |
671 | "on GG82563 phy.\n"); | ||
672 | 671 | ||
673 | ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT, | 672 | ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT, |
674 | 100000, &link); | 673 | 100000, &link); |
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index 6a6e6f6d9e73..53e5447cbbca 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c | |||
@@ -902,8 +902,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw) | |||
902 | } | 902 | } |
903 | 903 | ||
904 | if (!timeout) { | 904 | if (!timeout) { |
905 | e_dbg("Failed to acquire the semaphore, FW or HW has it: " | 905 | e_dbg("Failed to acquire the semaphore, FW or HW has it: FWSM=0x%8.8x EXTCNF_CTRL=0x%8.8x)\n", |
906 | "FWSM=0x%8.8x EXTCNF_CTRL=0x%8.8x)\n", | ||
907 | er32(FWSM), extcnf_ctrl); | 906 | er32(FWSM), extcnf_ctrl); |
908 | extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG; | 907 | extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG; |
909 | ew32(EXTCNF_CTRL, extcnf_ctrl); | 908 | ew32(EXTCNF_CTRL, extcnf_ctrl); |
@@ -2132,8 +2131,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) | |||
2132 | 2131 | ||
2133 | return 0; | 2132 | return 0; |
2134 | } | 2133 | } |
2135 | e_dbg("Unable to determine valid NVM bank via EEC - " | 2134 | e_dbg("Unable to determine valid NVM bank via EEC - reading flash signature\n"); |
2136 | "reading flash signature\n"); | ||
2137 | /* fall-thru */ | 2135 | /* fall-thru */ |
2138 | default: | 2136 | default: |
2139 | /* set bank to 0 in case flash read fails */ | 2137 | /* set bank to 0 in case flash read fails */ |
@@ -2245,8 +2243,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw) | |||
2245 | 2243 | ||
2246 | /* Check if the flash descriptor is valid */ | 2244 | /* Check if the flash descriptor is valid */ |
2247 | if (hsfsts.hsf_status.fldesvalid == 0) { | 2245 | if (hsfsts.hsf_status.fldesvalid == 0) { |
2248 | e_dbg("Flash descriptor invalid. " | 2246 | e_dbg("Flash descriptor invalid. SW Sequencing must be used.\n"); |
2249 | "SW Sequencing must be used.\n"); | ||
2250 | return -E1000_ERR_NVM; | 2247 | return -E1000_ERR_NVM; |
2251 | } | 2248 | } |
2252 | 2249 | ||
@@ -2446,8 +2443,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, | |||
2446 | /* Repeat for some time before giving up. */ | 2443 | /* Repeat for some time before giving up. */ |
2447 | continue; | 2444 | continue; |
2448 | } else if (hsfsts.hsf_status.flcdone == 0) { | 2445 | } else if (hsfsts.hsf_status.flcdone == 0) { |
2449 | e_dbg("Timeout error - flash cycle " | 2446 | e_dbg("Timeout error - flash cycle did not complete.\n"); |
2450 | "did not complete.\n"); | ||
2451 | break; | 2447 | break; |
2452 | } | 2448 | } |
2453 | } | 2449 | } |
@@ -2798,8 +2794,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset, | |||
2798 | /* Repeat for some time before giving up. */ | 2794 | /* Repeat for some time before giving up. */ |
2799 | continue; | 2795 | continue; |
2800 | if (hsfsts.hsf_status.flcdone == 0) { | 2796 | if (hsfsts.hsf_status.flcdone == 0) { |
2801 | e_dbg("Timeout error - flash cycle " | 2797 | e_dbg("Timeout error - flash cycle did not complete.\n"); |
2802 | "did not complete."); | ||
2803 | break; | 2798 | break; |
2804 | } | 2799 | } |
2805 | } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT); | 2800 | } while (count++ < ICH_FLASH_CYCLE_REPEAT_COUNT); |
diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c index 78e3f4c0c367..e2678bda8599 100644 --- a/drivers/net/ethernet/intel/e1000e/lib.c +++ b/drivers/net/ethernet/intel/e1000e/lib.c | |||
@@ -653,12 +653,10 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw) | |||
653 | if (rxcw & E1000_RXCW_SYNCH) { | 653 | if (rxcw & E1000_RXCW_SYNCH) { |
654 | if (!(rxcw & E1000_RXCW_IV)) { | 654 | if (!(rxcw & E1000_RXCW_IV)) { |
655 | mac->serdes_has_link = true; | 655 | mac->serdes_has_link = true; |
656 | e_dbg("SERDES: Link up - autoneg " | 656 | e_dbg("SERDES: Link up - autoneg completed successfully.\n"); |
657 | "completed successfully.\n"); | ||
658 | } else { | 657 | } else { |
659 | mac->serdes_has_link = false; | 658 | mac->serdes_has_link = false; |
660 | e_dbg("SERDES: Link down - invalid" | 659 | e_dbg("SERDES: Link down - invalid codewords detected in autoneg.\n"); |
661 | "codewords detected in autoneg.\n"); | ||
662 | } | 660 | } |
663 | } else { | 661 | } else { |
664 | mac->serdes_has_link = false; | 662 | mac->serdes_has_link = false; |
@@ -1118,8 +1116,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) | |||
1118 | return ret_val; | 1116 | return ret_val; |
1119 | 1117 | ||
1120 | if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) { | 1118 | if (!(mii_status_reg & MII_SR_AUTONEG_COMPLETE)) { |
1121 | e_dbg("Copper PHY and Auto Neg " | 1119 | e_dbg("Copper PHY and Auto Neg has not completed.\n"); |
1122 | "has not completed.\n"); | ||
1123 | return ret_val; | 1120 | return ret_val; |
1124 | } | 1121 | } |
1125 | 1122 | ||
@@ -1183,11 +1180,10 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) | |||
1183 | */ | 1180 | */ |
1184 | if (hw->fc.requested_mode == e1000_fc_full) { | 1181 | if (hw->fc.requested_mode == e1000_fc_full) { |
1185 | hw->fc.current_mode = e1000_fc_full; | 1182 | hw->fc.current_mode = e1000_fc_full; |
1186 | e_dbg("Flow Control = FULL.\r\n"); | 1183 | e_dbg("Flow Control = FULL.\n"); |
1187 | } else { | 1184 | } else { |
1188 | hw->fc.current_mode = e1000_fc_rx_pause; | 1185 | hw->fc.current_mode = e1000_fc_rx_pause; |
1189 | e_dbg("Flow Control = " | 1186 | e_dbg("Flow Control = Rx PAUSE frames only.\n"); |
1190 | "Rx PAUSE frames only.\r\n"); | ||
1191 | } | 1187 | } |
1192 | } | 1188 | } |
1193 | /* | 1189 | /* |
@@ -1203,7 +1199,7 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) | |||
1203 | (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && | 1199 | (mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && |
1204 | (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { | 1200 | (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { |
1205 | hw->fc.current_mode = e1000_fc_tx_pause; | 1201 | hw->fc.current_mode = e1000_fc_tx_pause; |
1206 | e_dbg("Flow Control = Tx PAUSE frames only.\r\n"); | 1202 | e_dbg("Flow Control = Tx PAUSE frames only.\n"); |
1207 | } | 1203 | } |
1208 | /* | 1204 | /* |
1209 | * For transmitting PAUSE frames ONLY. | 1205 | * For transmitting PAUSE frames ONLY. |
@@ -1218,14 +1214,14 @@ s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw) | |||
1218 | !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && | 1214 | !(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) && |
1219 | (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { | 1215 | (mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) { |
1220 | hw->fc.current_mode = e1000_fc_rx_pause; | 1216 | hw->fc.current_mode = e1000_fc_rx_pause; |
1221 | e_dbg("Flow Control = Rx PAUSE frames only.\r\n"); | 1217 | e_dbg("Flow Control = Rx PAUSE frames only.\n"); |
1222 | } else { | 1218 | } else { |
1223 | /* | 1219 | /* |
1224 | * Per the IEEE spec, at this point flow control | 1220 | * Per the IEEE spec, at this point flow control |
1225 | * should be disabled. | 1221 | * should be disabled. |
1226 | */ | 1222 | */ |
1227 | hw->fc.current_mode = e1000_fc_none; | 1223 | hw->fc.current_mode = e1000_fc_none; |
1228 | e_dbg("Flow Control = NONE.\r\n"); | 1224 | e_dbg("Flow Control = NONE.\n"); |
1229 | } | 1225 | } |
1230 | 1226 | ||
1231 | /* | 1227 | /* |
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index 8666476cb9be..ed70d08db5b6 100644 --- a/drivers/net/ethernet/intel/e1000e/phy.c +++ b/drivers/net/ethernet/intel/e1000e/phy.c | |||
@@ -1136,8 +1136,7 @@ static s32 e1000_copper_link_autoneg(struct e1000_hw *hw) | |||
1136 | if (phy->autoneg_wait_to_complete) { | 1136 | if (phy->autoneg_wait_to_complete) { |
1137 | ret_val = e1000_wait_autoneg(hw); | 1137 | ret_val = e1000_wait_autoneg(hw); |
1138 | if (ret_val) { | 1138 | if (ret_val) { |
1139 | e_dbg("Error while waiting for " | 1139 | e_dbg("Error while waiting for autoneg to complete\n"); |
1140 | "autoneg to complete\n"); | ||
1141 | return ret_val; | 1140 | return ret_val; |
1142 | } | 1141 | } |
1143 | } | 1142 | } |