Browse Source

iavf: finish renaming files to iavf

This finishes the process of renaming the files that
make sense to rename (skipping adminq related files that
talk to i40e), and fixes up the build and the #includes
so that everything builds nicely.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Jesse Brandeburg 7 years ago
parent
commit
66bc8e0f59

+ 1 - 1
drivers/net/ethernet/intel/iavf/Makefile

@@ -12,4 +12,4 @@ subdir-ccflags-y += -I$(src)
 obj-$(CONFIG_IAVF) += iavf.o
 
 iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o \
-	     iavf_txrx.o i40e_common.o i40e_adminq.o iavf_client.o
+	     iavf_txrx.o iavf_common.o i40e_adminq.o iavf_client.o

+ 4 - 4
drivers/net/ethernet/intel/iavf/i40e_adminq.c

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
-#include "i40e_status.h"
-#include "i40e_type.h"
-#include "i40e_register.h"
+#include "iavf_status.h"
+#include "iavf_type.h"
+#include "iavf_register.h"
 #include "i40e_adminq.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 
 /**
  *  i40e_adminq_init_regs - Initialize AdminQ registers

+ 2 - 2
drivers/net/ethernet/intel/iavf/i40e_adminq.h

@@ -4,8 +4,8 @@
 #ifndef _IAVF_ADMINQ_H_
 #define _IAVF_ADMINQ_H_
 
-#include "i40e_osdep.h"
-#include "i40e_status.h"
+#include "iavf_osdep.h"
+#include "iavf_status.h"
 #include "i40e_adminq_cmd.h"
 
 #define IAVF_ADMINQ_DESC(R, i)   \

+ 2 - 2
drivers/net/ethernet/intel/iavf/iavf.h

@@ -34,7 +34,7 @@
 #include <net/tc_act/tc_gact.h>
 #include <net/tc_act/tc_mirred.h>
 
-#include "i40e_type.h"
+#include "iavf_type.h"
 #include <linux/avf/virtchnl.h>
 #include "iavf_txrx.h"
 
@@ -298,7 +298,7 @@ struct iavf_adapter {
 	struct net_device *netdev;
 	struct pci_dev *pdev;
 
-	struct iavf_hw hw; /* defined in i40e_type.h */
+	struct iavf_hw hw; /* defined in iavf_type.h */
 
 	enum iavf_state_t state;
 	unsigned long crit_section;

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_alloc.h → drivers/net/ethernet/intel/iavf/iavf_alloc.h


+ 1 - 1
drivers/net/ethernet/intel/iavf/iavf_client.c

@@ -5,7 +5,7 @@
 #include <linux/errno.h>
 
 #include "iavf.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 #include "iavf_client.h"
 
 static

+ 2 - 2
drivers/net/ethernet/intel/iavf/i40e_common.c → drivers/net/ethernet/intel/iavf/iavf_common.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
-#include "i40e_type.h"
+#include "iavf_type.h"
 #include "i40e_adminq.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 #include <linux/avf/virtchnl.h>
 
 /**

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_devids.h → drivers/net/ethernet/intel/iavf/iavf_devids.h


+ 1 - 1
drivers/net/ethernet/intel/iavf/iavf_main.c

@@ -2,7 +2,7 @@
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
 #include "iavf.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 #include "iavf_client.h"
 /* All iavf tracepoints are defined by the include below, which must
  * be included exactly once across the whole kernel with

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_osdep.h → drivers/net/ethernet/intel/iavf/iavf_osdep.h


+ 2 - 2
drivers/net/ethernet/intel/iavf/i40e_prototype.h → drivers/net/ethernet/intel/iavf/iavf_prototype.h

@@ -4,8 +4,8 @@
 #ifndef _IAVF_PROTOTYPE_H_
 #define _IAVF_PROTOTYPE_H_
 
-#include "i40e_type.h"
-#include "i40e_alloc.h"
+#include "iavf_type.h"
+#include "iavf_alloc.h"
 #include <linux/avf/virtchnl.h>
 
 /* Prototypes for shared code functions that are not in

+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_register.h → drivers/net/ethernet/intel/iavf/iavf_register.h


+ 0 - 0
drivers/net/ethernet/intel/iavf/i40e_status.h → drivers/net/ethernet/intel/iavf/iavf_status.h


+ 1 - 1
drivers/net/ethernet/intel/iavf/iavf_txrx.c

@@ -6,7 +6,7 @@
 
 #include "iavf.h"
 #include "iavf_trace.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 
 static inline __le64 build_ctob(u32 td_cmd, u32 td_offset, unsigned int size,
 				u32 td_tag)

+ 4 - 4
drivers/net/ethernet/intel/iavf/i40e_type.h → drivers/net/ethernet/intel/iavf/iavf_type.h

@@ -4,11 +4,11 @@
 #ifndef _IAVF_TYPE_H_
 #define _IAVF_TYPE_H_
 
-#include "i40e_status.h"
-#include "i40e_osdep.h"
-#include "i40e_register.h"
+#include "iavf_status.h"
+#include "iavf_osdep.h"
+#include "iavf_register.h"
 #include "i40e_adminq.h"
-#include "i40e_devids.h"
+#include "iavf_devids.h"
 
 #define IAVF_RXQ_CTX_DBUFF_SHIFT 7
 

+ 1 - 1
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c

@@ -2,7 +2,7 @@
 /* Copyright(c) 2013 - 2018 Intel Corporation. */
 
 #include "iavf.h"
-#include "i40e_prototype.h"
+#include "iavf_prototype.h"
 #include "iavf_client.h"
 
 /* busy wait delay in msec */