aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/qib/qib_file_ops.c
diff options
context:
space:
mode:
authorMike Marciniszyn <mike.marciniszyn@intel.com>2015-01-16 11:23:31 -0500
committerRoland Dreier <roland@purestorage.com>2015-02-20 12:04:12 -0500
commitda12c1f6857c07bccdb7e96fde938d6840a77f4f (patch)
treef44e988e9085293d49d80a6231964443a2691e57 /drivers/infiniband/hw/qib/qib_file_ops.c
parenta46a2802f7470045714e8086d88a8b966b0753c3 (diff)
IB/qib: Add blank line after declaration
Upstream checkpatch now requires this. Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_file_ops.c')
-rw-r--r--drivers/infiniband/hw/qib/qib_file_ops.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 30bb16efb378..41937c6f888a 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1186,6 +1186,7 @@ static void assign_ctxt_affinity(struct file *fp, struct qib_devdata *dd)
1186 */ 1186 */
1187 if (weight >= qib_cpulist_count) { 1187 if (weight >= qib_cpulist_count) {
1188 int cpu; 1188 int cpu;
1189
1189 cpu = find_first_zero_bit(qib_cpulist, 1190 cpu = find_first_zero_bit(qib_cpulist,
1190 qib_cpulist_count); 1191 qib_cpulist_count);
1191 if (cpu == qib_cpulist_count) 1192 if (cpu == qib_cpulist_count)
@@ -1389,6 +1390,7 @@ static int choose_port_ctxt(struct file *fp, struct qib_devdata *dd, u32 port,
1389 } 1390 }
1390 if (!ppd) { 1391 if (!ppd) {
1391 u32 pidx = ctxt % dd->num_pports; 1392 u32 pidx = ctxt % dd->num_pports;
1393
1392 if (usable(dd->pport + pidx)) 1394 if (usable(dd->pport + pidx))
1393 ppd = dd->pport + pidx; 1395 ppd = dd->pport + pidx;
1394 else { 1396 else {
@@ -1436,10 +1438,12 @@ static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo,
1436 1438
1437 if (alg == QIB_PORT_ALG_ACROSS) { 1439 if (alg == QIB_PORT_ALG_ACROSS) {
1438 unsigned inuse = ~0U; 1440 unsigned inuse = ~0U;
1441
1439 /* find device (with ACTIVE ports) with fewest ctxts in use */ 1442 /* find device (with ACTIVE ports) with fewest ctxts in use */
1440 for (ndev = 0; ndev < devmax; ndev++) { 1443 for (ndev = 0; ndev < devmax; ndev++) {
1441 struct qib_devdata *dd = qib_lookup(ndev); 1444 struct qib_devdata *dd = qib_lookup(ndev);
1442 unsigned cused = 0, cfree = 0, pusable = 0; 1445 unsigned cused = 0, cfree = 0, pusable = 0;
1446
1443 if (!dd) 1447 if (!dd)
1444 continue; 1448 continue;
1445 if (port && port <= dd->num_pports && 1449 if (port && port <= dd->num_pports &&
@@ -1469,6 +1473,7 @@ static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo,
1469 } else { 1473 } else {
1470 for (ndev = 0; ndev < devmax; ndev++) { 1474 for (ndev = 0; ndev < devmax; ndev++) {
1471 struct qib_devdata *dd = qib_lookup(ndev); 1475 struct qib_devdata *dd = qib_lookup(ndev);
1476
1472 if (dd) { 1477 if (dd) {
1473 ret = choose_port_ctxt(fp, dd, port, uinfo); 1478 ret = choose_port_ctxt(fp, dd, port, uinfo);
1474 if (!ret) 1479 if (!ret)
@@ -1554,6 +1559,7 @@ static int find_hca(unsigned int cpu, int *unit)
1554 } 1559 }
1555 for (ndev = 0; ndev < devmax; ndev++) { 1560 for (ndev = 0; ndev < devmax; ndev++) {
1556 struct qib_devdata *dd = qib_lookup(ndev); 1561 struct qib_devdata *dd = qib_lookup(ndev);
1562
1557 if (dd) { 1563 if (dd) {
1558 if (pcibus_to_node(dd->pcidev->bus) < 0) { 1564 if (pcibus_to_node(dd->pcidev->bus) < 0) {
1559 ret = -EINVAL; 1565 ret = -EINVAL;