Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

IB: Whitespace fixes

Remove some trailing whitespace that has snuck in despite the best
efforts of whitespace=error-all. Also fix a few other whitespace
bogosities.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

+31 -33
+1 -1
drivers/infiniband/Kconfig
··· 14 14 ---help--- 15 15 Userspace InfiniBand Management Datagram (MAD) support. This 16 16 is the kernel side of the userspace MAD support, which allows 17 - userspace processes to send and receive MADs. You will also 17 + userspace processes to send and receive MADs. You will also 18 18 need libibumad from <http://www.openib.org>. 19 19 20 20 config INFINIBAND_USER_ACCESS
+2 -2
drivers/infiniband/core/addr.c
··· 327 327 } 328 328 EXPORT_SYMBOL(rdma_addr_cancel); 329 329 330 - static int netevent_callback(struct notifier_block *self, unsigned long event, 330 + static int netevent_callback(struct notifier_block *self, unsigned long event, 331 331 void *ctx) 332 332 { 333 - if (event == NETEVENT_NEIGH_UPDATE) { 333 + if (event == NETEVENT_NEIGH_UPDATE) { 334 334 struct neighbour *neigh = ctx; 335 335 336 336 if (neigh->dev->type == ARPHRD_INFINIBAND &&
+1 -1
drivers/infiniband/core/cm.c
··· 179 179 if (IS_ERR(ah)) 180 180 return PTR_ERR(ah); 181 181 182 - m = ib_create_send_mad(mad_agent, cm_id_priv->id.remote_cm_qpn, 182 + m = ib_create_send_mad(mad_agent, cm_id_priv->id.remote_cm_qpn, 183 183 cm_id_priv->av.pkey_index, 184 184 0, IB_MGMT_MAD_HDR, IB_MGMT_MAD_DATA, 185 185 GFP_ATOMIC);
+4 -4
drivers/infiniband/core/cma.c
··· 613 613 if (id_priv->cma_dev) { 614 614 switch (id_priv->id.device->node_type) { 615 615 case IB_NODE_CA: 616 - if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) 616 + if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) 617 617 ib_destroy_cm_id(id_priv->cm_id.ib); 618 618 break; 619 619 default: ··· 692 692 if (id_priv->cma_dev) { 693 693 switch (id->device->node_type) { 694 694 case IB_NODE_CA: 695 - if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) 695 + if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) 696 696 ib_destroy_cm_id(id_priv->cm_id.ib); 697 697 break; 698 698 default: 699 699 break; 700 700 } 701 - mutex_lock(&lock); 701 + mutex_lock(&lock); 702 702 cma_detach_from_dev(id_priv); 703 703 mutex_unlock(&lock); 704 704 } ··· 1492 1492 hlist_for_each_entry(cur_id, node, &bind_list->owners, node) { 1493 1493 if (cma_any_addr(&cur_id->id.route.addr.src_addr)) 1494 1494 return -EADDRNOTAVAIL; 1495 - 1495 + 1496 1496 cur_sin = (struct sockaddr_in *) &cur_id->id.route.addr.src_addr; 1497 1497 if (sin->sin_addr.s_addr == cur_sin->sin_addr.s_addr) 1498 1498 return -EADDRINUSE;
+6 -6
drivers/infiniband/core/mad.c
··· 1246 1246 int i; 1247 1247 1248 1248 for (i = 0; i < MAX_MGMT_OUI; i++) 1249 - /* Is there matching OUI for this vendor class ? */ 1250 - if (!memcmp(vendor_class->oui[i], oui, 3)) 1249 + /* Is there matching OUI for this vendor class ? */ 1250 + if (!memcmp(vendor_class->oui[i], oui, 3)) 1251 1251 return i; 1252 1252 1253 1253 return -1; ··· 2237 2237 list_for_each_entry_safe(mad_send_wr, temp_mad_send_wr, 2238 2238 &mad_agent_priv->send_list, agent_list) { 2239 2239 if (mad_send_wr->status == IB_WC_SUCCESS) { 2240 - mad_send_wr->status = IB_WC_WR_FLUSH_ERR; 2240 + mad_send_wr->status = IB_WC_WR_FLUSH_ERR; 2241 2241 mad_send_wr->refcount -= (mad_send_wr->timeout > 0); 2242 2242 } 2243 2243 } ··· 2528 2528 } 2529 2529 } 2530 2530 sg_list.addr = dma_map_single(qp_info->port_priv-> 2531 - device->dma_device, 2531 + device->dma_device, 2532 2532 &mad_priv->grh, 2533 2533 sizeof *mad_priv - 2534 - sizeof mad_priv->header, 2534 + sizeof mad_priv->header, 2535 2535 DMA_FROM_DEVICE); 2536 2536 pci_unmap_addr_set(&mad_priv->header, mapping, sg_list.addr); 2537 2537 recv_wr.wr_id = (unsigned long)&mad_priv->header.mad_list; ··· 2606 2606 struct ib_qp *qp; 2607 2607 2608 2608 attr = kmalloc(sizeof *attr, GFP_KERNEL); 2609 - if (!attr) { 2609 + if (!attr) { 2610 2610 printk(KERN_ERR PFX "Couldn't kmalloc ib_qp_attr\n"); 2611 2611 return -ENOMEM; 2612 2612 }
+1 -1
drivers/infiniband/core/mad_rmpp.c
··· 391 391 static struct ib_mad_recv_buf * find_seg_location(struct list_head *rmpp_list, 392 392 int seg_num) 393 393 { 394 - struct ib_mad_recv_buf *seg_buf; 394 + struct ib_mad_recv_buf *seg_buf; 395 395 int cur_seg_num; 396 396 397 397 list_for_each_entry_reverse(seg_buf, rmpp_list, list) {
+1 -1
drivers/infiniband/core/sa_query.c
··· 887 887 idr_remove(&query_idr, query->id); 888 888 spin_unlock_irqrestore(&idr_lock, flags); 889 889 890 - ib_free_send_mad(mad_send_wc->send_buf); 890 + ib_free_send_mad(mad_send_wc->send_buf); 891 891 kref_put(&query->sm_ah->ref, free_sm_ah); 892 892 query->release(query); 893 893 }
+1 -1
drivers/infiniband/core/sysfs.c
··· 68 68 int index; 69 69 }; 70 70 71 - static inline int ibdev_is_alive(const struct ib_device *dev) 71 + static inline int ibdev_is_alive(const struct ib_device *dev) 72 72 { 73 73 return dev->reg_state == IB_DEV_REGISTERED; 74 74 }
+3 -3
drivers/infiniband/core/ucm.c
··· 309 309 info = evt->param.apr_rcvd.apr_info; 310 310 break; 311 311 case IB_CM_SIDR_REQ_RECEIVED: 312 - uvt->resp.u.sidr_req_resp.pkey = 312 + uvt->resp.u.sidr_req_resp.pkey = 313 313 evt->param.sidr_req_rcvd.pkey; 314 - uvt->resp.u.sidr_req_resp.port = 314 + uvt->resp.u.sidr_req_resp.port = 315 315 evt->param.sidr_req_rcvd.port; 316 316 uvt->data_len = IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE; 317 317 break; ··· 1237 1237 static ssize_t show_ibdev(struct class_device *class_dev, char *buf) 1238 1238 { 1239 1239 struct ib_ucm_device *dev; 1240 - 1240 + 1241 1241 dev = container_of(class_dev, struct ib_ucm_device, class_dev); 1242 1242 return sprintf(buf, "%s\n", dev->ib_dev->name); 1243 1243 }
+1 -1
drivers/infiniband/core/user_mad.c
··· 1 1 /* 2 2 * Copyright (c) 2004 Topspin Communications. All rights reserved. 3 - * Copyright (c) 2005 Voltaire, Inc. All rights reserved. 3 + * Copyright (c) 2005 Voltaire, Inc. All rights reserved. 4 4 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. 5 5 * 6 6 * This software is available to you under a choice of one of two
-2
drivers/infiniband/core/uverbs_cmd.c
··· 1676 1676 break; 1677 1677 } 1678 1678 1679 - 1680 1679 if (copy_to_user((void __user *) (unsigned long) cmd.response, 1681 1680 &resp, sizeof resp)) 1682 1681 ret = -EFAULT; ··· 1724 1725 if (next == bad_wr) 1725 1726 break; 1726 1727 } 1727 - 1728 1728 1729 1729 if (copy_to_user((void __user *) (unsigned long) cmd.response, 1730 1730 &resp, sizeof resp))
+3 -3
drivers/infiniband/hw/ipath/ipath_driver.c
··· 2126 2126 dd->ipath_rx_pol_inv = new_pol_inv; 2127 2127 val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig); 2128 2128 val &= ~(INFINIPATH_XGXS_RX_POL_MASK << 2129 - INFINIPATH_XGXS_RX_POL_SHIFT); 2130 - val |= ((u64)dd->ipath_rx_pol_inv) << 2131 - INFINIPATH_XGXS_RX_POL_SHIFT; 2129 + INFINIPATH_XGXS_RX_POL_SHIFT); 2130 + val |= ((u64)dd->ipath_rx_pol_inv) << 2131 + INFINIPATH_XGXS_RX_POL_SHIFT; 2132 2132 ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val); 2133 2133 } 2134 2134 return 0;
+5 -5
drivers/infiniband/hw/mthca/mthca_cq.c
··· 544 544 wq = &(*cur_qp)->rq; 545 545 wqe = be32_to_cpu(cqe->wqe); 546 546 wqe_index = wqe >> wq->wqe_shift; 547 - /* 548 - * WQE addr == base - 1 might be reported in receive completion 549 - * with error instead of (rq size - 1) by Sinai FW 1.0.800 and 550 - * Arbel FW 5.1.400. This bug should be fixed in later FW revs. 551 - */ 547 + /* 548 + * WQE addr == base - 1 might be reported in receive completion 549 + * with error instead of (rq size - 1) by Sinai FW 1.0.800 and 550 + * Arbel FW 5.1.400. This bug should be fixed in later FW revs. 551 + */ 552 552 if (unlikely(wqe_index < 0)) 553 553 wqe_index = wq->max - 1; 554 554 entry->wr_id = (*cur_qp)->wrid[wqe_index];
+1 -1
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
··· 795 795 } 796 796 797 797 if (priv->broadcast) { 798 - rb_erase(&priv->broadcast->rb_node, &priv->multicast_tree); 798 + rb_erase(&priv->broadcast->rb_node, &priv->multicast_tree); 799 799 list_add_tail(&priv->broadcast->list, &remove_list); 800 800 priv->broadcast = NULL; 801 801 }
+1 -1
drivers/infiniband/ulp/srp/ib_srp.c
··· 330 330 req->priv.req_buf_fmt = cpu_to_be16(SRP_BUF_FORMAT_DIRECT | 331 331 SRP_BUF_FORMAT_INDIRECT); 332 332 /* 333 - * In the published SRP specification (draft rev. 16a), the 333 + * In the published SRP specification (draft rev. 16a), the 334 334 * port identifier format is 8 bytes of ID extension followed 335 335 * by 8 bytes of GUID. Older drafts put the two halves in the 336 336 * opposite order, so that the GUID comes first.