iavf: rename i40e_device to iavf_device

Renaming remaining defines from i40e to iavf

Signed-off-by: Alice Michael <alice.michael@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h
index 5a537d57a53192171d7eadd5ad322b0f87af32dc..6570194186938a8982e9613c189a58b6cdbadbed 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf.h
+++ b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -109,7 +109,7 @@ struct iavf_q_vector {
 
 /* Helper macros to switch between ints/sec and what the register uses.
  * And yes, it's the same math going both ways.  The lowest value
- * supported by all of the i40e hardware is 8.
+ * supported by all of the iavf hardware is 8.
  */
 #define EITR_INTS_PER_SEC_TO_REG(_eitr) \
        ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
@@ -351,7 +351,7 @@ struct iavf_adapter {
 /* Ethtool Private Flags */
 
 /* lan device, used by client interface */
-struct i40e_device {
+struct iavf_device {
        struct list_head list;
        struct iavf_adapter *vf;
 };

diff --git a/drivers/net/ethernet/intel/iavf/iavf_client.c b/drivers/net/ethernet/intel/iavf/iavf_client.c
index 83d7dd267aa816f056ba78689c63f180ac4a2e6a..f7414769fda530459e71e51a813ac19f1557c1df 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_client.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_client.c
@@ -11,7 +11,7 @@
 static
 const char iavf_client_interface_version_str[] = IAVF_CLIENT_VERSION_STR;
 static struct iavf_client *vf_registered_client;
-static LIST_HEAD(i40e_devices);
+static LIST_HEAD(iavf_devices);
 static DEFINE_MUTEX(iavf_device_mutex);
 
 static u32 iavf_client_virtchnl_send(struct iavf_info *ldev,
@@ -291,11 +291,11 @@ void iavf_client_subtask(struct iavf_adapter *adapter)
  **/
 int iavf_lan_add_device(struct iavf_adapter *adapter)
 {
-       struct i40e_device *ldev;
+       struct iavf_device *ldev;
        int ret = 0;
 
        mutex_lock(&iavf_device_mutex);
-       list_for_each_entry(ldev, &i40e_devices, list) {
+       list_for_each_entry(ldev, &iavf_devices, list) {
                if (ldev->vf == adapter) {
                        ret = -EEXIST;
                        goto out;
@@ -308,7 +308,7 @@ int iavf_lan_add_device(struct iavf_adapter *adapter)
        }
        ldev->vf = adapter;
        INIT_LIST_HEAD(&ldev->list);
-       list_add(&ldev->list, &i40e_devices);
+       list_add(&ldev->list, &iavf_devices);
        dev_info(&adapter->pdev->dev, "Added LAN device bus=0x%02x dev=0x%02x func=0x%02x\n",
                 adapter->hw.bus.bus_id, adapter->hw.bus.device,
                 adapter->hw.bus.func);
@@ -331,11 +331,11 @@ int iavf_lan_add_device(struct iavf_adapter *adapter)
  **/
 int iavf_lan_del_device(struct iavf_adapter *adapter)
 {
-       struct i40e_device *ldev, *tmp;
+       struct iavf_device *ldev, *tmp;
        int ret = -ENODEV;
 
        mutex_lock(&iavf_device_mutex);
-       list_for_each_entry_safe(ldev, tmp, &i40e_devices, list) {
+       list_for_each_entry_safe(ldev, tmp, &iavf_devices, list) {
                if (ldev->vf == adapter) {
                        dev_info(&adapter->pdev->dev,
                                 "Deleted LAN device bus=0x%02x dev=0x%02x func=0x%02x\n",
@@ -360,11 +360,11 @@ int iavf_lan_del_device(struct iavf_adapter *adapter)
 static void iavf_client_release(struct iavf_client *client)
 {
        struct iavf_client_instance *cinst;
-       struct i40e_device *ldev;
+       struct iavf_device *ldev;
        struct iavf_adapter *adapter;
 
        mutex_lock(&iavf_device_mutex);
-       list_for_each_entry(ldev, &i40e_devices, list) {
+       list_for_each_entry(ldev, &iavf_devices, list) {
                adapter = ldev->vf;
                cinst = adapter->cinst;
                if (!cinst)
@@ -394,11 +394,11 @@ static void iavf_client_release(struct iavf_client *client)
  **/
 static void iavf_client_prepare(struct iavf_client *client)
 {
-       struct i40e_device *ldev;
+       struct iavf_device *ldev;
        struct iavf_adapter *adapter;
 
        mutex_lock(&iavf_device_mutex);
-       list_for_each_entry(ldev, &i40e_devices, list) {
+       list_for_each_entry(ldev, &iavf_devices, list) {
                adapter = ldev->vf;
                /* Signal the watchdog to service the client */
                adapter->flags |= IAVF_FLAG_SERVICE_CLIENT_REQUESTED;