fm10k: cleanup overly long lines
Subsystems (2)
PATCH v2 1/1 fm10k: cleanup overly long lines
Signed-off-by Bruce Allan <[email protected]>
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 12 ++++++--- drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ++- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 29 ++++++++++++---------- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 7 +++-- 6 files changed, 33 insertions(+), 23 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +1 -1
@@ -166,7 +166,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 */ };
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +8 -4
@@ -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; }
drivers/net/ethernet/intel/fm10k/fm10k_mbx.c +1 -1
@@ -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
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +3 -1
@@ -787,7 +787,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 ;
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +16 -13
@@ -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; }
@@ -1895,17 +1896,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); }/**
@@ -2337,7 +2339,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 ; }
drivers/net/ethernet/intel/fm10k/fm10k_pf.c +4 -3
@@ -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);
Singh
PATCH v2 1/1 fm10k: cleanup overly long lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bruce Allan
Sent: Wednesday, October 28, 2015 5:20 PM
To: [email protected]
Subject: [Intel-wired-lan] [next-queue PATCH v2] fm10k: cleanup overly long lines
Signed-off-by Bruce Allan <[email protected]>
---
Tested-by Krishneil Singh <[email protected]>