staging: rdma: Fix braces around if/else

Get rid of all ELSE_AFTER_BRACE type errors reported by checkpatch.pl.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/ipath/ipath_driver.c b/drivers/staging/rdma/ipath/ipath_driver.c
index 871dbe56216a27e75ee64a1e4646ca027dd22a27..46d98980d66ae0adf53c55f1aa2554fa2cbd1a92 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_driver.c
+++ b/drivers/staging/rdma/ipath/ipath_driver.c
@@ -490,8 +490,7 @@ static int ipath_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                                "Unable to set DMA mask for unit %u: %d\n",
                                dd->ipath_unit, ret);
                        goto bail_regions;
-               }
-               else {
+               } else {
                        ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");
                        ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                        if (ret)
@@ -501,8 +500,7 @@ static int ipath_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                                        dd->ipath_unit, ret);
 
                }
-       }
-       else {
+       } else {
                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                if (ret)
                        dev_info(&pdev->dev,
@@ -1229,11 +1227,10 @@ reloop:
                        ipath_cdbg(PKT, "typ %x, opcode %x (eager, "
                                   "qp=%x), len %x; ignored\n",
                                   etype, opcode, qp, tlen);
-               }
-               else if (etype == RCVHQ_RCV_TYPE_EXPECTED)
+               } else if (etype == RCVHQ_RCV_TYPE_EXPECTED) {
                        ipath_dbg("Bug: Expected TID, opcode %x; ignored\n",
                                  be32_to_cpu(hdr->bth[0]) >> 24);
-               else {
+               } else {
                        /*
                         * error packet, type of error unknown.
                         * Probably type 3, but we don't know, so don't
@@ -1270,8 +1267,9 @@ reloop:
                                pd->port_seq_cnt = 1;
                        if (seq != pd->port_seq_cnt)
                                last = 1;
-               } else if (l == hdrqtail)
+               } else if (l == hdrqtail) {
                        last = 1;
+               }
                /*
                 * update head regs on last packet, and every 16 packets.
                 * Reduce bus traffic, while still trying to prevent
@@ -1821,15 +1819,14 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd,
                           (unsigned long) pd->port_rcvhdrq_phys,
                           (unsigned long) pd->port_rcvhdrq_size,
                           pd->port_port);
-       }
-       else
+       } else {
                ipath_cdbg(VERBOSE, "reuse port %d rcvhdrq @%p %llx phys; "
                           "hdrtailaddr@%p %llx physical\n",
                           pd->port_port, pd->port_rcvhdrq,
                           (unsigned long long) pd->port_rcvhdrq_phys,
                           pd->port_rcvhdrtail_kvaddr, (unsigned long long)
                           pd->port_rcvhdrqtailaddr_phys);
-
+       }
        /* clear for security and sanity on each use */
        memset(pd->port_rcvhdrq, 0, pd->port_rcvhdrq_size);
        if (pd->port_rcvhdrtail_kvaddr)

diff --git a/drivers/staging/rdma/ipath/ipath_file_ops.c b/drivers/staging/rdma/ipath/ipath_file_ops.c
index 450d1596500512c7f41174dec8d078bb15edb79a..c796a51faa9cbbbc992bd3cb355674b31d092ec3 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_file_ops.c
+++ b/drivers/staging/rdma/ipath/ipath_file_ops.c
@@ -825,13 +825,13 @@ static void ipath_clean_part_key(struct ipath_portdata *pd,
                                ipath_stats.sps_pkeys[j] =
                                        dd->ipath_pkeys[j] = 0;
                                pchanged++;
+                       } else {
+                               ipath_cdbg(VERBOSE, "p%u key %x matches #%d, "
+                                          "but ref still %d\n", pd->port_port,
+                                          pd->port_pkeys[i], j,
+                                          atomic_read(&dd->ipath_pkeyrefs[j]));
+                               break;
                        }
-                       else ipath_cdbg(
-                               VERBOSE, "p%u key %x matches #%d, "
-                               "but ref still %d\n", pd->port_port,
-                               pd->port_pkeys[i], j,
-                               atomic_read(&dd->ipath_pkeyrefs[j]));
-                       break;
                }
                pd->port_pkeys[i] = 0;
        }

diff --git a/drivers/staging/rdma/ipath/ipath_iba6110.c b/drivers/staging/rdma/ipath/ipath_iba6110.c
index 7cc305488a3d6bf0868692bf7d8ec268a74cdcd1..5f13572a5e24f051afd39014f5d5c1750477d69b 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_iba6110.c
+++ b/drivers/staging/rdma/ipath/ipath_iba6110.c
@@ -666,9 +666,9 @@ static void ipath_ht_handle_hwerrors(struct ipath_devdata *dd, char *msg,
                 * other reset is possible.
                 */
                dd->ipath_flags &= ~IPATH_INITTED;
-       }
-       else
+       } else {
                *msg = 0; /* recovered from all of them */
+       }
        if (*msg)
                ipath_dev_err(dd, "%s hardware error\n", msg);
        if (isfatal && !ipath_diag_inuse && dd->ipath_freezemsg)
@@ -1134,8 +1134,7 @@ static void ipath_setup_ht_setextled(struct ipath_devdata *dd,
                        extctl &= ~INFINIPATH_EXTC_LEDGBLERR_OFF;
                if (lst == INFINIPATH_IBCS_L_STATE_ACTIVE)
                        extctl |= INFINIPATH_EXTC_LEDGBLOK_ON;
-       }
-       else {
+       } else {
                extctl = dd->ipath_extctrl &
                        ~(INFINIPATH_EXTC_LED1PRIPORT_ON |
                          INFINIPATH_EXTC_LED2PRIPORT_ON);

diff --git a/drivers/staging/rdma/ipath/ipath_init_chip.c b/drivers/staging/rdma/ipath/ipath_init_chip.c
index be2a60e142b00b0e9af8e2eed5172700d731fbf2..e95af81ca3caa183909824b6e596f105317c47e2 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_init_chip.c
+++ b/drivers/staging/rdma/ipath/ipath_init_chip.c
@@ -324,10 +324,10 @@ static int init_chip_first(struct ipath_devdata *dd)
                          dd->ipath_pio2kbase, dd->ipath_piobcnt4k,
                          dd->ipath_piosize4k, dd->ipath_pio4kbase,
                          dd->ipath_4kalign);
+       } else {
+               ipath_dbg("%u 2k piobufs @ %p\n",
+                         dd->ipath_piobcnt2k, dd->ipath_pio2kbase);
        }
-       else ipath_dbg("%u 2k piobufs @ %p\n",
-                      dd->ipath_piobcnt2k, dd->ipath_pio2kbase);
-
 done:
        return ret;
 }
@@ -903,9 +903,9 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
                ipath_dev_err(dd, "failed to allocate kernel port's "
                              "rcvhdrq and/or egr bufs\n");
                goto done;
-       }
-       else
+       } else {
                enable_chip(dd, reinit);
+       }
 
        /* after enable_chip, so pioavailshadow setup */
        ipath_chg_pioavailkernel(dd, 0, piobufs, 1);

diff --git a/drivers/staging/rdma/ipath/ipath_intr.c b/drivers/staging/rdma/ipath/ipath_intr.c
index 01ba792791a0afbed1c030f20001271f6af63aa4..e568971087229a8ea8475fc092a50abffb19ee34 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_intr.c
+++ b/drivers/staging/rdma/ipath/ipath_intr.c
@@ -514,15 +514,14 @@ static unsigned handle_frequent_errors(struct ipath_devdata *dd,
                        *noprint = 1;
                        if (!supp_msgs++)
                                nextmsg_time = nc + HZ * 3;
-               }
-               else if (supp_msgs) {
+               } else if (supp_msgs) {
                        handle_supp_msgs(dd, supp_msgs, msg, msgsz);
                        supp_msgs = 0;
                        nmsgs = 0;
                }
-       }
-       else if (!nmsgs++ || time_after(nc, nextmsg_time))
+       } else if (!nmsgs++ || time_after(nc, nextmsg_time)) {
                nextmsg_time = nc + HZ / 2;
+       }
 
        return supp_msgs;
 }

diff --git a/drivers/staging/rdma/ipath/ipath_sysfs.c b/drivers/staging/rdma/ipath/ipath_sysfs.c
index 75558f33f1cb9971c2db3e0a04ba9bf70e993e69..b12b1f6caf59c1a9da7f94461e06411e1894c60e 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_sysfs.c
+++ b/drivers/staging/rdma/ipath/ipath_sysfs.c
@@ -662,8 +662,7 @@ static ssize_t store_enabled(struct device *dev,
                        dd->ipath_flags &= ~IPATH_DISABLED;
                        *dd->ipath_statusp &= ~IPATH_STATUS_ADMIN_DISABLED;
                }
-       }
-       else if (!(dd->ipath_flags & IPATH_DISABLED)) {
+       } else if (!(dd->ipath_flags & IPATH_DISABLED)) {
                dev_info(dev, "Disabling unit %d\n", dd->ipath_unit);
                ipath_shutdown_device(dd);
                dd->ipath_flags |= IPATH_DISABLED;
@@ -1176,9 +1175,9 @@ int ipath_expose_reset(struct device *dev)
        if (!exposed) {
                ret = device_create_file(dev, &dev_attr_reset);
                exposed = 1;
-       }
-       else
+       } else {
                ret = 0;
+       }
 
        return ret;
 }

diff --git a/drivers/staging/rdma/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c
index ed2bbc2f7eaeb76ab9a21913b0fbe1f887bc3895..17d9dca65755dd698261b8d87bcd4ad21a9c3740 100644 (file)
--- a/drivers/staging/rdma/ipath/ipath_verbs.c
+++ b/drivers/staging/rdma/ipath/ipath_verbs.c
@@ -739,9 +739,9 @@ static void ipath_ib_timer(struct ipath_ibdev *dev)
                        dev->ipath_spkts = tc - dev->ipath_spkts;
                        dev->ipath_rpkts = td - dev->ipath_rpkts;
                        dev->ipath_xmit_wait = te - dev->ipath_xmit_wait;
-               }
-               else
+               } else {
                        dev->pma_sample_interval--;
+               }
        }
        spin_unlock_irqrestore(&dev->pending_lock, flags);