]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
eth: bnxt: decrease indent in bnxt_request_irq()
authorJakub Kicinski <kuba@kernel.org>
Mon, 3 Aug 2026 19:31:34 +0000 (12:31 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 10 Aug 2026 22:15:06 +0000 (15:15 -0700)
bnxt_request_irq() has unnecessary level of indentation.
Use continue instead. No need to re-fetch NUMA node for
each IRQ, move to the function level.

No functional changes.

Reviewed-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260803193135.2030368-4-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 505d1afea71c71bc6f350ee113b944ccd47afbfd..b06cd8fd19ddf840f4aba3df4d19df35f9019549 100644 (file)
@@ -11910,6 +11910,7 @@ static void bnxt_free_irq(struct bnxt *bp)
 
 static int bnxt_request_irq(struct bnxt *bp)
 {
+       const int numa_node = dev_to_node(&bp->pdev->dev);
        struct cpu_rmap *rmap = NULL;
        int i, j, rc = 0;
        unsigned long flags = 0;
@@ -11932,6 +11933,7 @@ static int bnxt_request_irq(struct bnxt *bp)
        for (i = 0, j = 0; i < bp->cp_nr_rings; i++) {
                int map_idx = bnxt_cp_num_to_irq_num(bp, i);
                struct bnxt_irq *irq = &bp->irq_tbl[map_idx];
+               u16 tag;
 
                if (IS_ENABLED(CONFIG_RFS_ACCEL) &&
                    rmap && bp->bnapi[i]->rx_ring) {
@@ -11950,33 +11952,31 @@ static int bnxt_request_irq(struct bnxt *bp)
                netif_napi_set_irq_locked(&bp->bnapi[i]->napi, irq->vector);
                irq->requested = 1;
 
-               if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) {
-                       int numa_node = dev_to_node(&bp->pdev->dev);
-                       u16 tag;
+               if (!zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL))
+                       continue;
 
-                       irq->have_cpumask = 1;
-                       irq->msix_nr = map_idx;
-                       irq->ring_nr = i;
-                       cpumask_set_cpu(cpumask_local_spread(i, numa_node),
-                                       irq->cpu_mask);
-                       rc = irq_update_affinity_hint(irq->vector, irq->cpu_mask);
-                       if (rc) {
-                               netdev_warn(bp->dev,
-                                           "Update affinity hint failed, IRQ = %d\n",
-                                           irq->vector);
-                               break;
-                       }
+               irq->have_cpumask = 1;
+               irq->msix_nr = map_idx;
+               irq->ring_nr = i;
+               cpumask_set_cpu(cpumask_local_spread(i, numa_node),
+                               irq->cpu_mask);
+               rc = irq_update_affinity_hint(irq->vector, irq->cpu_mask);
+               if (rc) {
+                       netdev_warn(bp->dev,
+                                   "Update affinity hint failed, IRQ = %d\n",
+                                   irq->vector);
+                       break;
+               }
 
-                       bnxt_register_irq_notifier(bp, irq);
+               bnxt_register_irq_notifier(bp, irq);
 
-                       /* Init ST table entry */
-                       if (pcie_tph_get_cpu_st(irq->bp->pdev, TPH_MEM_TYPE_VM,
-                                               cpumask_first(irq->cpu_mask),
-                                               &tag))
-                               continue;
+               /* Init ST table entry */
+               if (pcie_tph_get_cpu_st(irq->bp->pdev, TPH_MEM_TYPE_VM,
+                                       cpumask_first(irq->cpu_mask),
+                                       &tag))
+                       continue;
 
-                       pcie_tph_set_st_entry(irq->bp->pdev, irq->msix_nr, tag);
-               }
+               pcie_tph_set_st_entry(irq->bp->pdev, irq->msix_nr, tag);
        }
        return rc;
 }