diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-12-16 00:46:54 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-01-26 18:30:39 -0800 |
| commit | 434f1392ae3a3934a33d2d16987d857c97951c3d (patch) | |
| tree | 16b75ddfb22d5f82587761e581694cf7a9a94591 /drivers/net/ethernet/intel/e1000e/phy.c | |
| parent | 464c85e37e6b2d2ad4f3bea23a59408c5595db15 (diff) | |
| download | olio-linux-3.10-434f1392ae3a3934a33d2d16987d857c97951c3d.tar.xz olio-linux-3.10-434f1392ae3a3934a33d2d16987d857c97951c3d.zip | |
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/ethernet/intel/e1000e/phy.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/phy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c index 8666476cb9b..ed70d08db5b 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) if (phy->autoneg_wait_to_complete) { ret_val = e1000_wait_autoneg(hw); if (ret_val) { - e_dbg("Error while waiting for " - "autoneg to complete\n"); + e_dbg("Error while waiting for autoneg to complete\n"); return ret_val; } } |