Commit 3d02b3df authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher

fm10k: cleanup overly long lines

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bb269e8b
...@@ -164,7 +164,7 @@ struct fm10k_ring_container { ...@@ -164,7 +164,7 @@ struct fm10k_ring_container {
unsigned int total_packets; /* total packets processed this int */ unsigned int total_packets; /* total packets processed this int */
u16 work_limit; /* total work allowed per interrupt */ u16 work_limit; /* total work allowed per interrupt */
u16 itr; /* interrupt throttle rate value */ 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 */ u8 count; /* total number of rings in vector */
}; };
......
...@@ -259,7 +259,8 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset) ...@@ -259,7 +259,8 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset)
stats_len += FM10K_DEBUG_STATS_LEN; stats_len += FM10K_DEBUG_STATS_LEN;
if (iov_data) 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; return stats_len;
...@@ -298,14 +299,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev, ...@@ -298,14 +299,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,
if (interface->flags & FM10K_FLAG_DEBUG_STATS) { if (interface->flags & FM10K_FLAG_DEBUG_STATS) {
for (i = 0; i < FM10K_DEBUG_STATS_LEN; i++) { 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 == *(data++) = (fm10k_gstrings_debug_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
} }
for (i = 0; i < FM10K_MBX_STATS_LEN; i++) { 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 == *(data++) = (fm10k_gstrings_mbx_stats[i].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
...@@ -332,7 +335,8 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev, ...@@ -332,7 +335,8 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,
} }
for (j = 0; j < FM10K_MBX_STATS_LEN; j++) { 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 == *(data++) = (fm10k_gstrings_mbx_stats[j].sizeof_stat ==
sizeof(u64)) ? *(u64 *)p : *(u32 *)p; sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
} }
......
...@@ -903,7 +903,7 @@ static void fm10k_mbx_create_disconnect_hdr(struct fm10k_mbx_info *mbx) ...@@ -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 * @mbx: pointer to mailbox
* *
* This function creates a fake disconnect header for loading into remote * This function creates a fake disconnect header for loading into remote
......
...@@ -789,7 +789,9 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) ...@@ -789,7 +789,9 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
rx_ring->vid &= ~FM10K_VLAN_CLEAR; 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) if (!set && vid == hw->mac.default_vid)
return 0; return 0;
......
...@@ -180,7 +180,8 @@ static void fm10k_reinit(struct fm10k_intfc *interface) ...@@ -180,7 +180,8 @@ static void fm10k_reinit(struct fm10k_intfc *interface)
err = fm10k_init_queueing_scheme(interface); err = fm10k_init_queueing_scheme(interface);
if (err) { 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; goto reinit_err;
} }
...@@ -1866,7 +1867,9 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface) ...@@ -1866,7 +1867,9 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)
return; return;
} }
if (max_gts < expected_gts) { if (max_gts >= expected_gts)
return;
dev_warn(&interface->pdev->dev, dev_warn(&interface->pdev->dev,
"This device requires %dGT/s of bandwidth for optimal performance.\n", "This device requires %dGT/s of bandwidth for optimal performance.\n",
expected_gts); expected_gts);
...@@ -1876,7 +1879,6 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface) ...@@ -1876,7 +1879,6 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)
hw->bus_caps.speed == fm10k_bus_speed_5000 ? "5.0GT/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.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),
hw->bus_caps.width); hw->bus_caps.width);
}
} }
/** /**
...@@ -2294,7 +2296,8 @@ static void fm10k_io_resume(struct pci_dev *pdev) ...@@ -2294,7 +2296,8 @@ static void fm10k_io_resume(struct pci_dev *pdev)
err = fm10k_init_queueing_scheme(interface); err = fm10k_init_queueing_scheme(interface);
if (err) { 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; return;
} }
......
...@@ -1441,7 +1441,8 @@ static void fm10k_update_hw_stats_pf(struct fm10k_hw *hw, ...@@ -1441,7 +1441,8 @@ static void fm10k_update_hw_stats_pf(struct fm10k_hw *hw,
xec = fm10k_read_hw_stats_32b(hw, FM10K_STATS_XEC, &stats->xec); xec = fm10k_read_hw_stats_32b(hw, FM10K_STATS_XEC, &stats->xec);
vlan_drop = fm10k_read_hw_stats_32b(hw, FM10K_STATS_VLAN_DROP, vlan_drop = fm10k_read_hw_stats_32b(hw, FM10K_STATS_VLAN_DROP,
&stats->vlan_drop); &stats->vlan_drop);
loopback_drop = fm10k_read_hw_stats_32b(hw, loopback_drop =
fm10k_read_hw_stats_32b(hw,
FM10K_STATS_LOOPBACK_DROP, FM10K_STATS_LOOPBACK_DROP,
&stats->loopback_drop); &stats->loopback_drop);
nodesc_drop = fm10k_read_hw_stats_32b(hw, nodesc_drop = fm10k_read_hw_stats_32b(hw,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment