lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: cleanup remaining strings split across multiple lines

Browse Source 
Now that split strings generate checkpatch warnings (per Chapter 2 of
Documentation/CodingStyle to make it easier to grep the code for the
string) cleanup the remaining instances of them in the driver.

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>
This commit is contained in:
Bruce Allan
2012-04-12 05:47:09 +00:00
committed by Jeff Kirsher
parent 48425b1492
commit 6ad651456e
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/ethernet/intel/e1000e/ethtool.c
View File

@@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev,
* cannot be changed * cannot be changed
*/ */
if (hw->phy.ops.check_reset_block(hw)) { if (hw->phy.ops.check_reset_block(hw)) {
e_err("Cannot change link characteristics when SoL/IDER is " e_err("Cannot change link characteristics when SoL/IDER is active.\n");
"active.\n");
return -EINVAL; return -EINVAL;
} }
@@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
(test[pat] & write)); (test[pat] & write));
val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset); val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
if (val != (test[pat] & write & mask)) { if (val != (test[pat] & write & mask)) {
e_err("pattern test reg %04X failed: got 0x%08X " e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
"expected 0x%08X\n", reg + offset, val, reg + offset, val, (test[pat] & write & mask));
(test[pat] & write & mask));
*data = reg; *data = reg;
return 1; return 1;
} }
@@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
__ew32(&adapter->hw, reg, write & mask); __ew32(&adapter->hw, reg, write & mask);
val = __er32(&adapter->hw, reg); val = __er32(&adapter->hw, reg);
if ((write & mask) != (val & mask)) { if ((write & mask) != (val & mask)) {
e_err("set/check reg %04X test failed: got 0x%08X " e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
"expected 0x%08X\n", reg, (val & mask), (write & mask)); reg, (val & mask), (write & mask));
*data = reg; *data = reg;
return 1; return 1;
} }
@@ -797,8 +795,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
ew32(STATUS, toggle); ew32(STATUS, toggle);
after = er32(STATUS) & toggle; after = er32(STATUS) & toggle;
if (value != after) { if (value != after) {
e_err("failed STATUS register test got: 0x%08X expected: " e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
"0x%08X\n", after, value); after, value);
*data = 1; *data = 1;
return 1; return 1;
} }
@@ -1791,8 +1789,7 @@ static void e1000_get_wol(struct net_device *netdev,
wol->supported &= ~WAKE_UCAST; wol->supported &= ~WAKE_UCAST;
if (adapter->wol & E1000_WUFC_EX) if (adapter->wol & E1000_WUFC_EX)
e_err("Interface does not support directed (unicast) " e_err("Interface does not support directed (unicast) frame wake-up packets\n");
"frame wake-up packets\n");
} }
if (adapter->wol & E1000_WUFC_EX) if (adapter->wol & E1000_WUFC_EX)

8
drivers/net/ethernet/intel/e1000e/param.c
View File

@@ -166,8 +166,8 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
* *
* Default Value: 1 (enabled) * Default Value: 1 (enabled)
*/ */
E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \ E1000_PARAM(CrcStripping,
"the CRC"); "Enable CRC Stripping, disable if your BMC needs the CRC");
struct e1000_option { struct e1000_option {
enum { enable_option, range_option, list_option } type; enum { enable_option, range_option, list_option } type;
@@ -360,8 +360,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
adapter->itr = 20000; adapter->itr = 20000;
break; break;
case 4: case 4:
e_info("%s set to simplified (2000-8000 ints) " e_info("%s set to simplified (2000-8000 ints) mode\n",
"mode\n", opt.name); opt.name);
adapter->itr_setting = 4; adapter->itr_setting = 4;
break; break;
default: default: