Skip to content

Commit 53b7990

Browse files
alicemicJeff Kirsher
authored andcommitted
iavf: rename i40e_device to iavf_device
Renaming remaining defines from i40e to iavf Signed-off-by: Alice Michael <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent db95059 commit 53b7990

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

drivers/net/ethernet/intel/iavf/iavf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ struct iavf_q_vector {
109109

110110
/* Helper macros to switch between ints/sec and what the register uses.
111111
* And yes, it's the same math going both ways. The lowest value
112-
* supported by all of the i40e hardware is 8.
112+
* supported by all of the iavf hardware is 8.
113113
*/
114114
#define EITR_INTS_PER_SEC_TO_REG(_eitr) \
115115
((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8)
@@ -351,7 +351,7 @@ struct iavf_adapter {
351351
/* Ethtool Private Flags */
352352

353353
/* lan device, used by client interface */
354-
struct i40e_device {
354+
struct iavf_device {
355355
struct list_head list;
356356
struct iavf_adapter *vf;
357357
};

drivers/net/ethernet/intel/iavf/iavf_client.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
static
1212
const char iavf_client_interface_version_str[] = IAVF_CLIENT_VERSION_STR;
1313
static struct iavf_client *vf_registered_client;
14-
static LIST_HEAD(i40e_devices);
14+
static LIST_HEAD(iavf_devices);
1515
static DEFINE_MUTEX(iavf_device_mutex);
1616

1717
static u32 iavf_client_virtchnl_send(struct iavf_info *ldev,
@@ -291,11 +291,11 @@ void iavf_client_subtask(struct iavf_adapter *adapter)
291291
**/
292292
int iavf_lan_add_device(struct iavf_adapter *adapter)
293293
{
294-
struct i40e_device *ldev;
294+
struct iavf_device *ldev;
295295
int ret = 0;
296296

297297
mutex_lock(&iavf_device_mutex);
298-
list_for_each_entry(ldev, &i40e_devices, list) {
298+
list_for_each_entry(ldev, &iavf_devices, list) {
299299
if (ldev->vf == adapter) {
300300
ret = -EEXIST;
301301
goto out;
@@ -308,7 +308,7 @@ int iavf_lan_add_device(struct iavf_adapter *adapter)
308308
}
309309
ldev->vf = adapter;
310310
INIT_LIST_HEAD(&ldev->list);
311-
list_add(&ldev->list, &i40e_devices);
311+
list_add(&ldev->list, &iavf_devices);
312312
dev_info(&adapter->pdev->dev, "Added LAN device bus=0x%02x dev=0x%02x func=0x%02x\n",
313313
adapter->hw.bus.bus_id, adapter->hw.bus.device,
314314
adapter->hw.bus.func);
@@ -331,11 +331,11 @@ int iavf_lan_add_device(struct iavf_adapter *adapter)
331331
**/
332332
int iavf_lan_del_device(struct iavf_adapter *adapter)
333333
{
334-
struct i40e_device *ldev, *tmp;
334+
struct iavf_device *ldev, *tmp;
335335
int ret = -ENODEV;
336336

337337
mutex_lock(&iavf_device_mutex);
338-
list_for_each_entry_safe(ldev, tmp, &i40e_devices, list) {
338+
list_for_each_entry_safe(ldev, tmp, &iavf_devices, list) {
339339
if (ldev->vf == adapter) {
340340
dev_info(&adapter->pdev->dev,
341341
"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)
360360
static void iavf_client_release(struct iavf_client *client)
361361
{
362362
struct iavf_client_instance *cinst;
363-
struct i40e_device *ldev;
363+
struct iavf_device *ldev;
364364
struct iavf_adapter *adapter;
365365

366366
mutex_lock(&iavf_device_mutex);
367-
list_for_each_entry(ldev, &i40e_devices, list) {
367+
list_for_each_entry(ldev, &iavf_devices, list) {
368368
adapter = ldev->vf;
369369
cinst = adapter->cinst;
370370
if (!cinst)
@@ -394,11 +394,11 @@ static void iavf_client_release(struct iavf_client *client)
394394
**/
395395
static void iavf_client_prepare(struct iavf_client *client)
396396
{
397-
struct i40e_device *ldev;
397+
struct iavf_device *ldev;
398398
struct iavf_adapter *adapter;
399399

400400
mutex_lock(&iavf_device_mutex);
401-
list_for_each_entry(ldev, &i40e_devices, list) {
401+
list_for_each_entry(ldev, &iavf_devices, list) {
402402
adapter = ldev->vf;
403403
/* Signal the watchdog to service the client */
404404
adapter->flags |= IAVF_FLAG_SERVICE_CLIENT_REQUESTED;

0 commit comments

Comments
 (0)