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

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
...@@ -541,7 +541,6 @@ struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = { ...@@ -541,7 +541,6 @@ struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = {
I40E_PTT_UNUSED_ENTRY(255) I40E_PTT_UNUSED_ENTRY(255)
}; };
/** /**
* i40e_init_shared_code - Initialize the shared code * i40e_init_shared_code - Initialize the shared code
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
......
...@@ -2380,7 +2380,7 @@ static int i40e_set_channels(struct net_device *dev, ...@@ -2380,7 +2380,7 @@ static int i40e_set_channels(struct net_device *dev,
* *
* Returns a u32 bitmap of flags. * 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_netdev_priv *np = netdev_priv(dev);
struct i40e_vsi *vsi = np->vsi; struct i40e_vsi *vsi = np->vsi;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
* *
******************************************************************************/ ******************************************************************************/
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
...@@ -1447,7 +1446,6 @@ static int i40e_fcoe_set_features(struct net_device *netdev, ...@@ -1447,7 +1446,6 @@ static int i40e_fcoe_set_features(struct net_device *netdev,
return 0; return 0;
} }
static const struct net_device_ops i40e_fcoe_netdev_ops = { static const struct net_device_ops i40e_fcoe_netdev_ops = {
.ndo_open = i40e_open, .ndo_open = i40e_open,
.ndo_stop = i40e_close, .ndo_stop = i40e_close,
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#define I40E_FILTER_CONTEXT_DESC(R, i) \ #define I40E_FILTER_CONTEXT_DESC(R, i) \
(&(((struct i40e_fcoe_filter_context_desc *)((R)->desc))[i])) (&(((struct i40e_fcoe_filter_context_desc *)((R)->desc))[i]))
/* receive queue descriptor filter status for FCoE */ /* receive queue descriptor filter status for FCoE */
#define I40E_RX_DESC_FLTSTAT_FCMASK 0x3 #define I40E_RX_DESC_FLTSTAT_FCMASK 0x3
#define I40E_RX_DESC_FLTSTAT_NOMTCH 0x0 /* no ddp context match */ #define I40E_RX_DESC_FLTSTAT_NOMTCH 0x0 /* no ddp context match */
......
...@@ -9586,7 +9586,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -9586,7 +9586,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dev_info(&pdev->dev, 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"); "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); i40e_verify_eeprom(pf);
/* Rev 0 hardware was never productized */ /* Rev 0 hardware was never productized */
......
...@@ -542,7 +542,6 @@ struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = { ...@@ -542,7 +542,6 @@ struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {
I40E_PTT_UNUSED_ENTRY(255) I40E_PTT_UNUSED_ENTRY(255)
}; };
/** /**
* i40e_aq_send_msg_to_pf * i40e_aq_send_msg_to_pf
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
......
...@@ -59,8 +59,7 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, ...@@ -59,8 +59,7 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,
void i40e_idle_aq(struct i40e_hw *hw); void i40e_idle_aq(struct i40e_hw *hw);
void i40evf_resume_aq(struct i40e_hw *hw); void i40evf_resume_aq(struct i40e_hw *hw);
bool i40evf_check_asq_alive(struct i40e_hw *hw); bool i40evf_check_asq_alive(struct i40e_hw *hw);
i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);
bool unloading);
i40e_status i40e_set_mac_type(struct i40e_hw *hw); i40e_status i40e_set_mac_type(struct i40e_hw *hw);
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
struct i40evf_stats { struct i40evf_stats {
char stat_string[ETH_GSTRING_LEN]; char stat_string[ETH_GSTRING_LEN];
int stat_offset; int stat_offset;
......
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