iavf: use iavf_schedule_aq_request() helper

Use the iavf_schedule_aq_request() helper when we need to
schedule a watchdog task immediately. No functional change.

Signed-off-by: Petr Oros <poros@redhat.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
index 6f236d1a6444e83cd86abed8c51c1d744ed642f4..6b3d3e54b8b772fd2e4240ccc6a4bca66a9f7f03 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_ethtool.c
@@ -1445,10 +1445,9 @@ static int iavf_add_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rx
        iavf_fdir_list_add_fltr(adapter, fltr);
        adapter->fdir_active_fltr++;
        fltr->state = IAVF_FDIR_FLTR_ADD_REQUEST;
-       adapter->aq_required |= IAVF_FLAG_AQ_ADD_FDIR_FILTER;
        spin_unlock_bh(&adapter->fdir_fltr_lock);
 
-       mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+       iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_FDIR_FILTER);
 
 ret:
        if (err && fltr)
@@ -1479,7 +1478,6 @@ static int iavf_del_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rx
        if (fltr) {
                if (fltr->state == IAVF_FDIR_FLTR_ACTIVE) {
                        fltr->state = IAVF_FDIR_FLTR_DEL_REQUEST;
-                       adapter->aq_required |= IAVF_FLAG_AQ_DEL_FDIR_FILTER;
                } else {
                        err = -EBUSY;
                }
@@ -1489,7 +1487,7 @@ static int iavf_del_fdir_ethtool(struct iavf_adapter *adapter, struct ethtool_rx
        spin_unlock_bh(&adapter->fdir_fltr_lock);
 
        if (fltr && fltr->state == IAVF_FDIR_FLTR_DEL_REQUEST)
-               mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+               iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_DEL_FDIR_FILTER);
 
        return err;
 }
@@ -1658,7 +1656,6 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter,
                        rss_old->hash_flds = hash_flds;
                        memcpy(&rss_old->cfg_msg, &rss_new->cfg_msg,
                               sizeof(rss_new->cfg_msg));
-                       adapter->aq_required |= IAVF_FLAG_AQ_ADD_ADV_RSS_CFG;
                } else {
                        err = -EEXIST;
                }
@@ -1668,12 +1665,11 @@ iavf_set_adv_rss_hash_opt(struct iavf_adapter *adapter,
                rss_new->packet_hdrs = hdrs;
                rss_new->hash_flds = hash_flds;
                list_add_tail(&rss_new->list, &adapter->adv_rss_list_head);
-               adapter->aq_required |= IAVF_FLAG_AQ_ADD_ADV_RSS_CFG;
        }
        spin_unlock_bh(&adapter->adv_rss_lock);
 
        if (!err)
-               mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+               iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_ADV_RSS_CFG);
 
        mutex_unlock(&adapter->crit_lock);
 

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 27d63b6056389394d83bc83a5d74822608d6e2f5..06a87030c163deaf44eb0722f5f46965bfb0f51b 100644 (file)
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -1059,13 +1059,12 @@ static int iavf_replace_primary_mac(struct iavf_adapter *adapter,
         */
        new_f->is_primary = true;
        new_f->add = true;
-       adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER;
        ether_addr_copy(hw->mac.addr, new_mac);
 
        spin_unlock_bh(&adapter->mac_vlan_list_lock);
 
        /* schedule the watchdog task to immediately process the request */
-       mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+       iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_MAC_FILTER);
        return 0;
 }
 
@@ -1284,8 +1283,7 @@ static void iavf_up_complete(struct iavf_adapter *adapter)
 
        iavf_napi_enable_all(adapter);
 
-       adapter->aq_required |= IAVF_FLAG_AQ_ENABLE_QUEUES;
-       mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+       iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ENABLE_QUEUES);
 }
 
 /**
@@ -1439,8 +1437,7 @@ void iavf_down(struct iavf_adapter *adapter)
                        adapter->aq_required |= IAVF_FLAG_AQ_DEL_ADV_RSS_CFG;
        }
 
-       adapter->aq_required |= IAVF_FLAG_AQ_DISABLE_QUEUES;
-       mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
+       iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_DISABLE_QUEUES);
 }
 
 /**
@@ -2337,10 +2334,8 @@ iavf_set_vlan_offload_features(struct iavf_adapter *adapter,
                }
        }
 
-       if (aq_required) {
-               adapter->aq_required |= aq_required;
-               mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
-       }
+       if (aq_required)
+               iavf_schedule_aq_request(adapter, aq_required);
 }
 
 /**