aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Dalessandro <dennis.dalessandro@intel.com>2017-04-09 13:17:18 -0400
committerDoug Ledford <dledford@redhat.com>2017-04-28 13:56:23 -0400
commitee495ada5c5681e66c20e9927fa35252bdf7fba0 (patch)
tree3f258e7af394f23993e63d3556e89e8a02c770e2
parent08af5916b3b0ace9c97e5bf5d89122a0c7aa5c58 (diff)
IB/hfi1: Fix unbalanced braces around else
Add missing braces around else blocks in a few places to make checkpatch happy. Fixes: 7724105686e7 ("IB/hfi1: add driver files") Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/infiniband/hw/hfi1/chip.c4
-rw-r--r--drivers/infiniband/hw/hfi1/init.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 4c5e4aa6ef37..0f6916d2d549 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -8185,10 +8185,10 @@ static irqreturn_t sdma_interrupt(int irq, void *data)
8185 8185
8186 /* handle the interrupt(s) */ 8186 /* handle the interrupt(s) */
8187 sdma_engine_interrupt(sde, status); 8187 sdma_engine_interrupt(sde, status);
8188 } else 8188 } else {
8189 dd_dev_err(dd, "SDMA engine %u interrupt, but no status bits set\n", 8189 dd_dev_err(dd, "SDMA engine %u interrupt, but no status bits set\n",
8190 sde->this_idx); 8190 sde->this_idx);
8191 8191 }
8192 return IRQ_HANDLED; 8192 return IRQ_HANDLED;
8193} 8193}
8194 8194
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 51b760971e1e..4d6b9f82efa3 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -246,9 +246,10 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt,
246 if (ctxt < kctxt_ngroups) { 246 if (ctxt < kctxt_ngroups) {
247 base = ctxt * (dd->rcv_entries.ngroups + 1); 247 base = ctxt * (dd->rcv_entries.ngroups + 1);
248 rcd->rcv_array_groups++; 248 rcd->rcv_array_groups++;
249 } else 249 } else {
250 base = kctxt_ngroups + 250 base = kctxt_ngroups +
251 (ctxt * dd->rcv_entries.ngroups); 251 (ctxt * dd->rcv_entries.ngroups);
252 }
252 } else { 253 } else {
253 u16 ct = ctxt - dd->first_dyn_alloc_ctxt; 254 u16 ct = ctxt - dd->first_dyn_alloc_ctxt;
254 255
@@ -257,9 +258,10 @@ struct hfi1_ctxtdata *hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, u32 ctxt,
257 if (ct < dd->rcv_entries.nctxt_extra) { 258 if (ct < dd->rcv_entries.nctxt_extra) {
258 base += ct * (dd->rcv_entries.ngroups + 1); 259 base += ct * (dd->rcv_entries.ngroups + 1);
259 rcd->rcv_array_groups++; 260 rcd->rcv_array_groups++;
260 } else 261 } else {
261 base += dd->rcv_entries.nctxt_extra + 262 base += dd->rcv_entries.nctxt_extra +
262 (ct * dd->rcv_entries.ngroups); 263 (ct * dd->rcv_entries.ngroups);
264 }
263 } 265 }
264 rcd->eager_base = base * dd->rcv_entries.group_size; 266 rcd->eager_base = base * dd->rcv_entries.group_size;
265 267