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

Commit 5bbc3301 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: Clean up some formatting and other things 



Fix some double blank lines and un-split a function declaration that all
fits on one line. Also make i40e_get_priv_flags static.

Change-ID: I11b5d25d1153a06b286d0d2f5d916d7727c58e4a
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarNeerav Parikh <neerav.parikh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 180204c7

drivers/net/ethernet/intel/i40e/i40e_common.c

+0 −1
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = { 
	I40E_PTT_UNUSED_ENTRY(255)

};





/**

 * i40e_init_shared_code - Initialize the shared code

 * @hw: pointer to hardware structure

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -2380,7 +2380,7 @@ static int i40e_set_channels(struct net_device *dev, 
 *

 * Returns a u32 bitmap of flags.

 **/

u32 i40e_get_priv_flags(struct net_device *dev)

static u32 i40e_get_priv_flags(struct net_device *dev)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;

drivers/net/ethernet/intel/i40e/i40e_fcoe.c

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
 *

 ******************************************************************************/





#include <linux/if_ether.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_device.h>
@@ -1447,7 +1446,6 @@ static int i40e_fcoe_set_features(struct net_device *netdev, 
	return 0;

}





static const struct net_device_ops i40e_fcoe_netdev_ops = {

	.ndo_open		= i40e_open,

	.ndo_stop		= i40e_close,

drivers/net/ethernet/intel/i40e/i40e_fcoe.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define I40E_FILTER_CONTEXT_DESC(R, i)  \

	(&(((struct i40e_fcoe_filter_context_desc *)((R)->desc))[i]))





/* receive queue descriptor filter status for FCoE */

#define I40E_RX_DESC_FLTSTAT_FCMASK	0x3

#define I40E_RX_DESC_FLTSTAT_NOMTCH	0x0	/* no ddp context match */

drivers/net/ethernet/intel/i40e/i40e_main.c

+0 −1
Original line number Diff line number Diff line
@@ -9586,7 +9586,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_info(&pdev->dev,

			 "The driver for the device detected an older version of the NVM image than expected. Please update the NVM image.\n");





	i40e_verify_eeprom(pf);



	/* Rev 0 hardware was never productized */