fm10k: cleanup overly long lines

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h
index 849e36d8e10e26729b7c537cfed5bd36b779259e..021abe301f2fe07e8238228e7a9118322df3eb6b 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h
@@ -164,7 +164,7 @@ struct fm10k_ring_container {
        unsigned int total_packets;     /* total packets processed this int */
        u16 work_limit;                 /* total work allowed per interrupt */
        u16 itr;                        /* interrupt throttle rate value */
-       u8 itr_scale;                   /* ITR adjustment scaler based on PCI speed */
+       u8 itr_scale;                   /* ITR adjustment based on PCI speed */
        u8 count;                       /* total number of rings in vector */
 };
 

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 3b857f46f6122c7edeec989ee7dd2b0909b91d5b..2f6a05b572288ad04d223f75706616dcdb822893 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -259,7 +259,8 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset)
                        stats_len += FM10K_DEBUG_STATS_LEN;
 
                        if (iov_data)
-                               stats_len += FM10K_MBX_STATS_LEN * iov_data->num_vfs;
+                               stats_len += FM10K_MBX_STATS_LEN *
+                                       iov_data->num_vfs;
                }
 
                return stats_len;
@@ -298,14 +299,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,
 
        if (interface->flags & FM10K_FLAG_DEBUG_STATS) {
                for (i = 0; i < FM10K_DEBUG_STATS_LEN; i++) {
-                       p = (char *)interface + fm10k_gstrings_debug_stats[i].stat_offset;
+                       p = (char *)interface +
+                               fm10k_gstrings_debug_stats[i].stat_offset;
                        *(data++) = (fm10k_gstrings_debug_stats[i].sizeof_stat ==
                                     sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
                }
        }
 
        for (i = 0; i < FM10K_MBX_STATS_LEN; i++) {
-               p = (char *)&interface->hw.mbx + fm10k_gstrings_mbx_stats[i].stat_offset;
+               p = (char *)&interface->hw.mbx +
+                       fm10k_gstrings_mbx_stats[i].stat_offset;
                *(data++) = (fm10k_gstrings_mbx_stats[i].sizeof_stat ==
                        sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
        }
@@ -332,7 +335,8 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,
                        }
 
                        for (j = 0; j < FM10K_MBX_STATS_LEN; j++) {
-                               p = (char *)&vf_info->mbx + fm10k_gstrings_mbx_stats[j].stat_offset;
+                               p = (char *)&vf_info->mbx +
+                                       fm10k_gstrings_mbx_stats[j].stat_offset;
                                *(data++) = (fm10k_gstrings_mbx_stats[j].sizeof_stat ==
                                             sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
                        }

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
index b31bbc28e9e312459d260bc408a171d95297ca6e..c7fea47b8909f269382bb9f13dbbab9f4a3742ad 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c
@@ -903,7 +903,7 @@ static void fm10k_mbx_create_disconnect_hdr(struct fm10k_mbx_info *mbx)
 }
 
 /**
- *  fm10k_mbx_create_fake_disconnect_hdr - Generate a false disconnect mailbox header
+ *  fm10k_mbx_create_fake_disconnect_hdr - Generate a false disconnect mbox hdr
  *  @mbx: pointer to mailbox
  *
  *  This function creates a fake disconnect header for loading into remote

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index c9c94c41fca863cbfe09dc0631c1197d427f7f68..d9854d39576d46281a8fa60f2584d7cad46f890e 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -789,7 +789,9 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
                        rx_ring->vid &= ~FM10K_VLAN_CLEAR;
        }
 
-       /* Do not remove default VLAN ID related entries from VLAN and MAC tables */
+       /* Do not remove default VLAN ID related entries from VLAN and MAC
+        * tables
+        */
        if (!set && vid == hw->mac.default_vid)
                return 0;
 

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 84424a86954c450370415b269d56a2819bb4eb4c..e820b5f34eeb4b9da7ca785f8fc1bc6d074cbf50 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -180,7 +180,8 @@ static void fm10k_reinit(struct fm10k_intfc *interface)
 
        err = fm10k_init_queueing_scheme(interface);
        if (err) {
-               dev_err(&interface->pdev->dev, "init_queueing_scheme failed: %d\n", err);
+               dev_err(&interface->pdev->dev,
+                       "init_queueing_scheme failed: %d\n", err);
                goto reinit_err;
        }
 
@@ -1866,17 +1867,18 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)
                return;
        }
 
-       if (max_gts < expected_gts) {
-               dev_warn(&interface->pdev->dev,
-                        "This device requires %dGT/s of bandwidth for optimal performance.\n",
-                        expected_gts);
-               dev_warn(&interface->pdev->dev,
-                        "A %sslot with x%d lanes is suggested.\n",
-                        (hw->bus_caps.speed == fm10k_bus_speed_2500 ? "2.5GT/s " :
-                         hw->bus_caps.speed == fm10k_bus_speed_5000 ? "5.0GT/s " :
-                         hw->bus_caps.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),
-                        hw->bus_caps.width);
-       }
+       if (max_gts >= expected_gts)
+               return;
+
+       dev_warn(&interface->pdev->dev,
+                "This device requires %dGT/s of bandwidth for optimal performance.\n",
+                expected_gts);
+       dev_warn(&interface->pdev->dev,
+                "A %sslot with x%d lanes is suggested.\n",
+                (hw->bus_caps.speed == fm10k_bus_speed_2500 ? "2.5GT/s " :
+                 hw->bus_caps.speed == fm10k_bus_speed_5000 ? "5.0GT/s " :
+                 hw->bus_caps.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),
+                hw->bus_caps.width);
 }
 
 /**
@@ -2294,7 +2296,8 @@ static void fm10k_io_resume(struct pci_dev *pdev)
 
        err = fm10k_init_queueing_scheme(interface);
        if (err) {
-               dev_err(&interface->pdev->dev, "init_queueing_scheme failed: %d\n", err);
+               dev_err(&interface->pdev->dev,
+                       "init_queueing_scheme failed: %d\n", err);
                return;
        }
 

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
index ac3dc284323c7a54c3f8f9cb0deb251889ced196..808307e677187c9ffb00eeb9060eb8880d100ec5 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
@@ -1441,9 +1441,10 @@ static void fm10k_update_hw_stats_pf(struct fm10k_hw *hw,
                xec = fm10k_read_hw_stats_32b(hw, FM10K_STATS_XEC, &stats->xec);
                vlan_drop = fm10k_read_hw_stats_32b(hw, FM10K_STATS_VLAN_DROP,
                                                    &stats->vlan_drop);
-               loopback_drop = fm10k_read_hw_stats_32b(hw,
-                                                       FM10K_STATS_LOOPBACK_DROP,
-                                                       &stats->loopback_drop);
+               loopback_drop =
+                       fm10k_read_hw_stats_32b(hw,
+                                               FM10K_STATS_LOOPBACK_DROP,
+                                               &stats->loopback_drop);
                nodesc_drop = fm10k_read_hw_stats_32b(hw,
                                                      FM10K_STATS_NODESC_DROP,
                                                      &stats->nodesc_drop);