netdev: use napi_schedule bool instead of napi_schedule_prep/__napi_schedule

Replace if condition of napi_schedule_prep/__napi_schedule and use bool
from napi_schedule directly where possible.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Link: https://lore.kernel.org/r/20231009133754.9834-5-ansuelsmth@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 02aa6fd8ebc2d47f5752eec49199b6cc41d6c1f1..a9014d7932dbf1e5f32171d9a6bdef04683059bc 100644 (file)
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2446,7 +2446,7 @@ static int atl1_rings_clean(struct napi_struct *napi, int budget)
 
 static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)
 {
-       if (!napi_schedule_prep(&adapter->napi))
+       if (!napi_schedule(&adapter->napi))
                /* It is possible in case even the RX/TX ints are disabled via IMR
                 * register the ISR bits are set anyway (but do not produce IRQ).
                 * To handle such situation the napi functions used to check is
@@ -2454,8 +2454,6 @@ static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)
                 */
                return 0;
 
-       __napi_schedule(&adapter->napi);
-
        /*
         * Disable RX/TX ints via IMR register if it is
         * allowed. NAPI handler must reenable them in same

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index 23b5a0adcbd62ba65ab7d0f4ffc7cacee76cba18..146bc7bd14fbc0d0a626e4096a186b283551c389 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -1660,9 +1660,7 @@ irqreturn_t iwl_pcie_irq_rx_msix_handler(int irq, void *dev_id)
        IWL_DEBUG_ISR(trans, "[%d] Got interrupt\n", entry->entry);
 
        local_bh_disable();
-       if (napi_schedule_prep(&rxq->napi))
-               __napi_schedule(&rxq->napi);
-       else
+       if (!napi_schedule(&rxq->napi))
                iwl_pcie_clear_irq(trans, entry->entry);
        local_bh_enable();