OSDN Git Service

net:cxgb3: fix code style issues
authorÍñigo Huguet <ihuguet@redhat.com>
Thu, 3 Jun 2021 06:34:30 +0000 (08:34 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Jun 2021 21:57:37 +0000 (14:57 -0700)
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

index 84ad726..57f210c 100644 (file)
@@ -1273,14 +1273,14 @@ static int cxgb_up(struct adapter *adap)
                        free_irq(adap->msix_info[0].vec, adap);
                        goto irq_err;
                }
-       } else if ((err = request_irq(adap->pdev->irq,
-                                     t3_intr_handler(adap,
-                                                     adap->sge.qs[0].rspq.
-                                                     polling),
-                                     (adap->flags & USING_MSI) ?
-                                      0 : IRQF_SHARED,
-                                     adap->name, adap)))
-               goto irq_err;
+       } else {
+               err = request_irq(adap->pdev->irq,
+                                 t3_intr_handler(adap, adap->sge.qs[0].rspq.polling),
+                                 (adap->flags & USING_MSI) ? 0 : IRQF_SHARED,
+                                 adap->name, adap);
+               if (err)
+                       goto irq_err;
+       }
 
        enable_all_napi(adap);
        t3_sge_start(adap);
@@ -3098,8 +3098,9 @@ static void set_nqsets(struct adapter *adap)
                        nqsets = num_cpus;
                if (nqsets < 1 || hwports == 4)
                        nqsets = 1;
-       } else
+       } else {
                nqsets = 1;
+       }
 
        for_each_port(adap, i) {
                struct port_info *pi = adap2pinfo(adap, i);