e1000e: cleanup remaining strings split across multiple lines

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>

2 files changed, 12 insertions, 15 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 6302b10cb3a..4f1edd9c22f 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev,
          * cannot be changed
          */
         if (hw->phy.ops.check_reset_block(hw)) {
-                e_err("Cannot change link characteristics when SoL/IDER is "
-                      "active.\n");
+                e_err("Cannot change link characteristics when SoL/IDER is active.\n");
                 return -EINVAL;
         }
 
@@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data,
                                       (test[pat] & write));
                 val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
                 if (val != (test[pat] & write & mask)) {
-                        e_err("pattern test reg %04X failed: got 0x%08X "
-                              "expected 0x%08X\n", reg + offset, val,
-                              (test[pat] & write & mask));
+                        e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
+                              reg + offset, val, (test[pat] & write & mask));
                         *data = reg;
                         return 1;
                 }
@@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data,
         __ew32(&adapter->hw, reg, write & mask);
         val = __er32(&adapter->hw, reg);
         if ((write & mask) != (val & mask)) {
-                e_err("set/check reg %04X test failed: got 0x%08X "
-                      "expected 0x%08X\n", reg, (val & mask), (write & mask));
+                e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
+                      reg, (val & mask), (write & mask));
                 *data = reg;
                 return 1;
         }
@@ -797,8 +795,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
         ew32(STATUS, toggle);
         after = er32(STATUS) & toggle;
         if (value != after) {
-                e_err("failed STATUS register test got: 0x%08X expected: "
-                      "0x%08X\n", after, value);
+                e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
+                      after, value);
                 *data = 1;
                 return 1;
         }
@@ -1791,8 +1789,7 @@ static void e1000_get_wol(struct net_device *netdev,
                 wol->supported &= ~WAKE_UCAST;
 
                 if (adapter->wol & E1000_WUFC_EX)
-                        e_err("Interface does not support directed (unicast) "
-                              "frame wake-up packets\n");
+                        e_err("Interface does not support directed (unicast) frame wake-up packets\n");
         }
 
         if (adapter->wol & E1000_WUFC_EX)
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index ff796e42c3e..feb6eebb002 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -166,8 +166,8 @@ E1000_PARAM(WriteProtectNVM, "Write-protect NVM [WARNING: disabling this can lea
  *
  * Default Value: 1 (enabled)
  */
-E1000_PARAM(CrcStripping, "Enable CRC Stripping, disable if your BMC needs " \
-                          "the CRC");
+E1000_PARAM(CrcStripping,
+            "Enable CRC Stripping, disable if your BMC needs the CRC");
 
 struct e1000_option {
         enum { enable_option, range_option, list_option } type;
@@ -360,8 +360,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                                 adapter->itr = 20000;
                                 break;
                         case 4:
-                                e_info("%s set to simplified (2000-8000 ints) "
-                                       "mode\n", opt.name);
+                                e_info("%s set to simplified (2000-8000 ints) mode\n",
+                                       opt.name);
                                 adapter->itr_setting = 4;
                                 break;
                         default: