ethernet/intel: Use list_for_each_entry() helper

Convert list_for_each() to list_for_each_entry() where applicable.

No functional changed.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20230919170409.1581074-1-anthony.l.nguyen@intel.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 76b34cee1da3c8d9a18d3254be5b88f79882ff53..2ac9dffd0bf864b94efa8bb4c22e6ae9ceb53fa4 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7857,7 +7857,6 @@ static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
 {
        struct pci_dev *pdev = adapter->pdev;
        struct vf_data_storage *vf_data = &adapter->vf_data[vf];
-       struct list_head *pos;
        struct vf_mac_filter *entry = NULL;
        int ret = 0;
 
@@ -7878,8 +7877,7 @@ static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
        switch (info) {
        case E1000_VF_MAC_FILTER_CLR:
                /* remove all unicast MAC filters related to the current VF */
-               list_for_each(pos, &adapter->vf_macs.l) {
-                       entry = list_entry(pos, struct vf_mac_filter, l);
+               list_for_each_entry(entry, &adapter->vf_macs.l, l) {
                        if (entry->vf == vf) {
                                entry->vf = -1;
                                entry->free = true;
@@ -7889,8 +7887,7 @@ static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf,
                break;
        case E1000_VF_MAC_FILTER_ADD:
                /* try to find empty slot in the list */
-               list_for_each(pos, &adapter->vf_macs.l) {
-                       entry = list_entry(pos, struct vf_mac_filter, l);
+               list_for_each_entry(entry, &adapter->vf_macs.l, l) {
                        if (entry->free)
                                break;
                }

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 29cc6098807120aa3213f9f43704e01b55a6a120..4c6e2a485d8eff5d6ff854f9c2ef692ab87d2564 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -639,12 +639,10 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
                                int vf, int index, unsigned char *mac_addr)
 {
        struct vf_macvlans *entry;
-       struct list_head *pos;
        int retval = 0;
 
        if (index <= 1) {
-               list_for_each(pos, &adapter->vf_mvs.l) {
-                       entry = list_entry(pos, struct vf_macvlans, l);
+               list_for_each_entry(entry, &adapter->vf_mvs.l, l) {
                        if (entry->vf == vf) {
                                entry->vf = -1;
                                entry->free = true;
@@ -664,8 +662,7 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
 
        entry = NULL;
 
-       list_for_each(pos, &adapter->vf_mvs.l) {
-               entry = list_entry(pos, struct vf_macvlans, l);
+       list_for_each_entry(entry, &adapter->vf_mvs.l, l) {
                if (entry->free)
                        break;
        }