Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/intel/fm10k/fm10k.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

};

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+8 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+16 −13
Original line number Diff line number Diff line
@@ -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,7 +1867,9 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface) 
		return;

	}



	if (max_gts < expected_gts) {

	if (max_gts >= expected_gts)

		return;



	dev_warn(&interface->pdev->dev,

		 "This device requires %dGT/s of bandwidth for optimal performance.\n",

		 expected_gts);
@@ -1877,7 +1880,6 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface) 
		  hw->bus_caps.speed == fm10k_bus_speed_8000 ? "8.0GT/s " : ""),

		 hw->bus_caps.width);

}

}



/**

 * fm10k_probe - Device Initialization Routine
@@ -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;

	}