iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB: Whitespace fixes

Browse Source 
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>
This commit is contained in:
Roland Dreier
2006-09-22 15:22:46 -07:00
parent f06d265375
commit 3cd965646b
15 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/core/cma.c
View File

@ -613,7 +613,7 @@ static void cma_destroy_listen(struct rdma_id_private *id_priv)
if (id_priv->cma_dev) { if (id_priv->cma_dev) {
switch (id_priv->id.device->node_type) { switch (id_priv->id.device->node_type) {
case IB_NODE_CA: case IB_NODE_CA:
if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib))
ib_destroy_cm_id(id_priv->cm_id.ib); ib_destroy_cm_id(id_priv->cm_id.ib);
break; break;
default: default:
@ -692,13 +692,13 @@ void rdma_destroy_id(struct rdma_cm_id *id)
if (id_priv->cma_dev) { if (id_priv->cma_dev) {
switch (id->device->node_type) { switch (id->device->node_type) {
case IB_NODE_CA: case IB_NODE_CA:
if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib)) if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib))
ib_destroy_cm_id(id_priv->cm_id.ib); ib_destroy_cm_id(id_priv->cm_id.ib);
break; break;
default: default:
break; break;
} }
mutex_lock(&lock); mutex_lock(&lock);
cma_detach_from_dev(id_priv); cma_detach_from_dev(id_priv);
mutex_unlock(&lock); mutex_unlock(&lock);
} }

12
drivers/infiniband/core/mad.c
View File

@ -1246,8 +1246,8 @@ static int find_vendor_oui(struct ib_mad_mgmt_vendor_class *vendor_class,
int i; int i;
for (i = 0; i < MAX_MGMT_OUI; i++) for (i = 0; i < MAX_MGMT_OUI; i++)
/* Is there matching OUI for this vendor class ? */ /* Is there matching OUI for this vendor class ? */
if (!memcmp(vendor_class->oui[i], oui, 3)) if (!memcmp(vendor_class->oui[i], oui, 3))
return i; return i;
return -1; return -1;
@ -2237,7 +2237,7 @@ static void cancel_mads(struct ib_mad_agent_private *mad_agent_priv)
list_for_each_entry_safe(mad_send_wr, temp_mad_send_wr, list_for_each_entry_safe(mad_send_wr, temp_mad_send_wr,
&mad_agent_priv->send_list, agent_list) { &mad_agent_priv->send_list, agent_list) {
if (mad_send_wr->status == IB_WC_SUCCESS) { if (mad_send_wr->status == IB_WC_SUCCESS) {
mad_send_wr->status = IB_WC_WR_FLUSH_ERR; mad_send_wr->status = IB_WC_WR_FLUSH_ERR;
mad_send_wr->refcount -= (mad_send_wr->timeout > 0); mad_send_wr->refcount -= (mad_send_wr->timeout > 0);
} }
} }
@ -2528,10 +2528,10 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info,
} }
} }
sg_list.addr = dma_map_single(qp_info->port_priv-> sg_list.addr = dma_map_single(qp_info->port_priv->
device->dma_device, device->dma_device,
&mad_priv->grh, &mad_priv->grh,
sizeof *mad_priv - sizeof *mad_priv -
sizeof mad_priv->header, sizeof mad_priv->header,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
pci_unmap_addr_set(&mad_priv->header, mapping, sg_list.addr); pci_unmap_addr_set(&mad_priv->header, mapping, sg_list.addr);
recv_wr.wr_id = (unsigned long)&mad_priv->header.mad_list; recv_wr.wr_id = (unsigned long)&mad_priv->header.mad_list;
@ -2606,7 +2606,7 @@ static int ib_mad_port_start(struct ib_mad_port_private *port_priv)
struct ib_qp *qp; struct ib_qp *qp;
attr = kmalloc(sizeof *attr, GFP_KERNEL); attr = kmalloc(sizeof *attr, GFP_KERNEL);
if (!attr) { if (!attr) {
printk(KERN_ERR PFX "Couldn't kmalloc ib_qp_attr\n"); printk(KERN_ERR PFX "Couldn't kmalloc ib_qp_attr\n");
return -ENOMEM; return -ENOMEM;
} }

2
drivers/infiniband/core/mad_rmpp.c
View File

@ -391,7 +391,7 @@ static inline int window_size(struct ib_mad_agent_private *agent)
static struct ib_mad_recv_buf * find_seg_location(struct list_head *rmpp_list, static struct ib_mad_recv_buf * find_seg_location(struct list_head *rmpp_list,
int seg_num) int seg_num)
{ {
struct ib_mad_recv_buf *seg_buf; struct ib_mad_recv_buf *seg_buf;
int cur_seg_num; int cur_seg_num;
list_for_each_entry_reverse(seg_buf, rmpp_list, list) { list_for_each_entry_reverse(seg_buf, rmpp_list, list) {

2
drivers/infiniband/core/sa_query.c
View File

@ -887,7 +887,7 @@ static void send_handler(struct ib_mad_agent *agent,
idr_remove(&query_idr, query->id); idr_remove(&query_idr, query->id);
spin_unlock_irqrestore(&idr_lock, flags); spin_unlock_irqrestore(&idr_lock, flags);
ib_free_send_mad(mad_send_wc->send_buf); ib_free_send_mad(mad_send_wc->send_buf);
kref_put(&query->sm_ah->ref, free_sm_ah); kref_put(&query->sm_ah->ref, free_sm_ah);
query->release(query); query->release(query);
} }

2
drivers/infiniband/core/uverbs_cmd.c
View File

@ -1676,7 +1676,6 @@ ssize_t ib_uverbs_post_recv(struct ib_uverbs_file *file,
break; break;
} }
if (copy_to_user((void __user *) (unsigned long) cmd.response, if (copy_to_user((void __user *) (unsigned long) cmd.response,
&resp, sizeof resp)) &resp, sizeof resp))
ret = -EFAULT; ret = -EFAULT;
@ -1726,7 +1725,6 @@ ssize_t ib_uverbs_post_srq_recv(struct ib_uverbs_file *file,
break; break;
} }
if (copy_to_user((void __user *) (unsigned long) cmd.response, if (copy_to_user((void __user *) (unsigned long) cmd.response,
&resp, sizeof resp)) &resp, sizeof resp))
ret = -EFAULT; ret = -EFAULT;

6
drivers/infiniband/hw/ipath/ipath_driver.c
View File

@ -2126,9 +2126,9 @@ int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv)
dd->ipath_rx_pol_inv = new_pol_inv; dd->ipath_rx_pol_inv = new_pol_inv;
val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig); val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig);
val &= ~(INFINIPATH_XGXS_RX_POL_MASK << val &= ~(INFINIPATH_XGXS_RX_POL_MASK <<
INFINIPATH_XGXS_RX_POL_SHIFT); INFINIPATH_XGXS_RX_POL_SHIFT);
val |= ((u64)dd->ipath_rx_pol_inv) << val |= ((u64)dd->ipath_rx_pol_inv) <<
INFINIPATH_XGXS_RX_POL_SHIFT; INFINIPATH_XGXS_RX_POL_SHIFT;
ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val); ipath_write_kreg(dd, dd->ipath_kregs->kr_xgxsconfig, val);
} }
return 0; return 0;

10
drivers/infiniband/hw/mthca/mthca_cq.c
View File

@ -544,11 +544,11 @@ static inline int mthca_poll_one(struct mthca_dev *dev,
wq = &(*cur_qp)->rq; wq = &(*cur_qp)->rq;
wqe = be32_to_cpu(cqe->wqe); wqe = be32_to_cpu(cqe->wqe);
wqe_index = wqe >> wq->wqe_shift; wqe_index = wqe >> wq->wqe_shift;
/* /*
* WQE addr == base - 1 might be reported in receive completion * WQE addr == base - 1 might be reported in receive completion
* with error instead of (rq size - 1) by Sinai FW 1.0.800 and * with error instead of (rq size - 1) by Sinai FW 1.0.800 and
* Arbel FW 5.1.400. This bug should be fixed in later FW revs. * Arbel FW 5.1.400. This bug should be fixed in later FW revs.
*/ */
if (unlikely(wqe_index < 0)) if (unlikely(wqe_index < 0))
wqe_index = wq->max - 1; wqe_index = wq->max - 1;
entry->wr_id = (*cur_qp)->wrid[wqe_index]; entry->wr_id = (*cur_qp)->wrid[wqe_index];

2
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
View File

@ -795,7 +795,7 @@ void ipoib_mcast_dev_flush(struct net_device *dev)
} }
if (priv->broadcast) { if (priv->broadcast) {
rb_erase(&priv->broadcast->rb_node, &priv->multicast_tree); rb_erase(&priv->broadcast->rb_node, &priv->multicast_tree);
list_add_tail(&priv->broadcast->list, &remove_list); list_add_tail(&priv->broadcast->list, &remove_list);
priv->broadcast = NULL; priv->broadcast = NULL;
} }