lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/mthca: Whitespace cleanups

Browse Source 
Remove trailing whitespace and fix indentation that with spaces
instead of tabs.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier
2006-02-01 13:38:24 -08:00
parent 4885bf64bc
commit 2fa5e2ebbe
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/infiniband/hw/mthca/mthca_av.c
View File

@@ -147,7 +147,7 @@ int mthca_destroy_ah(struct mthca_dev *dev, struct mthca_ah *ah)
switch (ah->type) { switch (ah->type) {
case MTHCA_AH_ON_HCA: case MTHCA_AH_ON_HCA:
mthca_free(&dev->av_table.alloc, mthca_free(&dev->av_table.alloc,
(ah->avdma - dev->av_table.ddr_av_base) / (ah->avdma - dev->av_table.ddr_av_base) /
MTHCA_AV_SIZE); MTHCA_AV_SIZE);
break; break;

2
drivers/infiniband/hw/mthca/mthca_cmd.c
View File

@@ -275,7 +275,7 @@ static int mthca_cmd_poll(struct mthca_dev *dev,
} }
if (out_is_imm) if (out_is_imm)
*out_param = *out_param =
(u64) be32_to_cpu((__force __be32) (u64) be32_to_cpu((__force __be32)
__raw_readl(dev->hcr + HCR_OUT_PARAM_OFFSET)) << 32 | __raw_readl(dev->hcr + HCR_OUT_PARAM_OFFSET)) << 32 |
(u64) be32_to_cpu((__force __be32) (u64) be32_to_cpu((__force __be32)

4
drivers/infiniband/hw/mthca/mthca_cmd.h
View File

@@ -74,9 +74,9 @@ enum {
MTHCA_CMD_STAT_REG_BOUND = 0x21, MTHCA_CMD_STAT_REG_BOUND = 0x21,
/* HCA local attached memory not present: */ /* HCA local attached memory not present: */
MTHCA_CMD_STAT_LAM_NOT_PRE = 0x22, MTHCA_CMD_STAT_LAM_NOT_PRE = 0x22,
/* Bad management packet (silently discarded): */ /* Bad management packet (silently discarded): */
MTHCA_CMD_STAT_BAD_PKT = 0x30, MTHCA_CMD_STAT_BAD_PKT = 0x30,
/* More outstanding CQEs in CQ than new CQ size: */ /* More outstanding CQEs in CQ than new CQ size: */
MTHCA_CMD_STAT_BAD_SIZE = 0x40 MTHCA_CMD_STAT_BAD_SIZE = 0x40
}; };

2
drivers/infiniband/hw/mthca/mthca_eq.c
View File

@@ -497,7 +497,7 @@ static int __devinit mthca_create_eq(struct mthca_dev *dev,
eq->dev = dev; eq->dev = dev;
eq->nent = roundup_pow_of_two(max(nent, 2)); eq->nent = roundup_pow_of_two(max(nent, 2));
npages = ALIGN(eq->nent * MTHCA_EQ_ENTRY_SIZE, PAGE_SIZE) / PAGE_SIZE; npages = ALIGN(eq->nent * MTHCA_EQ_ENTRY_SIZE, PAGE_SIZE) / PAGE_SIZE;
eq->page_list = kmalloc(npages * sizeof *eq->page_list, eq->page_list = kmalloc(npages * sizeof *eq->page_list,
GFP_KERNEL); GFP_KERNEL);

2
drivers/infiniband/hw/mthca/mthca_mcg.c
View File

@@ -187,7 +187,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
for (i = 0; i < MTHCA_QP_PER_MGM; ++i) for (i = 0; i < MTHCA_QP_PER_MGM; ++i)
if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31))) { if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31))) {
mthca_dbg(dev, "QP %06x already a member of MGM\n", mthca_dbg(dev, "QP %06x already a member of MGM\n",
ibqp->qp_num); ibqp->qp_num);
err = 0; err = 0;
goto out; goto out;

6
drivers/infiniband/hw/mthca/mthca_mr.c
View File

@@ -517,7 +517,7 @@ int mthca_fmr_alloc(struct mthca_dev *dev, u32 pd,
BUG_ON(!mr->mem.arbel.mpt); BUG_ON(!mr->mem.arbel.mpt);
} else } else
mr->mem.tavor.mpt = dev->mr_table.tavor_fmr.mpt_base + mr->mem.tavor.mpt = dev->mr_table.tavor_fmr.mpt_base +
sizeof *(mr->mem.tavor.mpt) * idx; sizeof *(mr->mem.tavor.mpt) * idx;
mr->mtt = __mthca_alloc_mtt(dev, list_len, dev->mr_table.fmr_mtt_buddy); mr->mtt = __mthca_alloc_mtt(dev, list_len, dev->mr_table.fmr_mtt_buddy);
if (IS_ERR(mr->mtt)) if (IS_ERR(mr->mtt))
@@ -779,7 +779,7 @@ int __devinit mthca_init_mr_table(struct mthca_dev *dev)
} }
dev->mr_table.tavor_fmr.mpt_base = dev->mr_table.tavor_fmr.mpt_base =
ioremap(dev->mr_table.mpt_base, ioremap(dev->mr_table.mpt_base,
(1 << i) * sizeof (struct mthca_mpt_entry)); (1 << i) * sizeof (struct mthca_mpt_entry));
if (!dev->mr_table.tavor_fmr.mpt_base) { if (!dev->mr_table.tavor_fmr.mpt_base) {
@@ -807,7 +807,7 @@ int __devinit mthca_init_mr_table(struct mthca_dev *dev)
goto err_reserve_fmr; goto err_reserve_fmr;
dev->mr_table.fmr_mtt_buddy = dev->mr_table.fmr_mtt_buddy =
&dev->mr_table.tavor_fmr.mtt_buddy; &dev->mr_table.tavor_fmr.mtt_buddy;
} else } else
dev->mr_table.fmr_mtt_buddy = &dev->mr_table.mtt_buddy; dev->mr_table.fmr_mtt_buddy = &dev->mr_table.mtt_buddy;

4
drivers/infiniband/hw/mthca/mthca_provider.c
View File

@@ -108,12 +108,12 @@ static int mthca_query_device(struct ib_device *ibdev,
props->max_srq_wr = mdev->limits.max_srq_wqes; props->max_srq_wr = mdev->limits.max_srq_wqes;
props->max_srq_sge = mdev->limits.max_sg; props->max_srq_sge = mdev->limits.max_sg;
props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay; props->local_ca_ack_delay = mdev->limits.local_ca_ack_delay;
props->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ? props->atomic_cap = mdev->limits.flags & DEV_LIM_FLAG_ATOMIC ?
IB_ATOMIC_HCA : IB_ATOMIC_NONE; IB_ATOMIC_HCA : IB_ATOMIC_NONE;
props->max_pkeys = mdev->limits.pkey_table_len; props->max_pkeys = mdev->limits.pkey_table_len;
props->max_mcast_grp = mdev->limits.num_mgms + mdev->limits.num_amgms; props->max_mcast_grp = mdev->limits.num_mgms + mdev->limits.num_amgms;
props->max_mcast_qp_attach = MTHCA_QP_PER_MGM; props->max_mcast_qp_attach = MTHCA_QP_PER_MGM;
props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
props->max_mcast_grp; props->max_mcast_grp;
err = 0; err = 0;

28
drivers/infiniband/hw/mthca/mthca_qp.c
View File

@@ -2,7 +2,7 @@
* Copyright (c) 2004 Topspin Communications. All rights reserved. * Copyright (c) 2004 Topspin Communications. All rights reserved.
* Copyright (c) 2005 Cisco Systems. All rights reserved. * Copyright (c) 2005 Cisco Systems. All rights reserved.
* Copyright (c) 2005 Mellanox Technologies. All rights reserved. * Copyright (c) 2005 Mellanox Technologies. All rights reserved.
* Copyright (c) 2004 Voltaire, Inc. All rights reserved. * Copyright (c) 2004 Voltaire, Inc. All rights reserved.
* *
* This software is available to you under a choice of one of two * This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU * licenses. You may choose to be licensed under the terms of the GNU
@@ -559,9 +559,9 @@ static void mthca_path_set(struct ib_ah_attr *ah, struct mthca_qp_path *path)
path->g_mylmc |= 1 << 7; path->g_mylmc |= 1 << 7;
path->mgid_index = ah->grh.sgid_index; path->mgid_index = ah->grh.sgid_index;
path->hop_limit = ah->grh.hop_limit; path->hop_limit = ah->grh.hop_limit;
path->sl_tclass_flowlabel = path->sl_tclass_flowlabel =
cpu_to_be32((ah->sl << 28) | cpu_to_be32((ah->sl << 28) |
(ah->grh.traffic_class << 20) | (ah->grh.traffic_class << 20) |
(ah->grh.flow_label)); (ah->grh.flow_label));
memcpy(path->rgid, ah->grh.dgid.raw, 16); memcpy(path->rgid, ah->grh.dgid.raw, 16);
} else } else
@@ -597,7 +597,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
} }
if (attr_mask & IB_QP_STATE) { if (attr_mask & IB_QP_STATE) {
if (attr->qp_state < 0 || attr->qp_state > IB_QPS_ERR) if (attr->qp_state < 0 || attr->qp_state > IB_QPS_ERR)
return -EINVAL; return -EINVAL;
new_state = attr->qp_state; new_state = attr->qp_state;
} else } else
@@ -630,10 +630,10 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
return -EINVAL; return -EINVAL;
} }
if ((attr_mask & IB_QP_PKEY_INDEX) && if ((attr_mask & IB_QP_PKEY_INDEX) &&
attr->pkey_index >= dev->limits.pkey_table_len) { attr->pkey_index >= dev->limits.pkey_table_len) {
mthca_dbg(dev, "PKey index (%u) too large. max is %d\n", mthca_dbg(dev, "PKey index (%u) too large. max is %d\n",
attr->pkey_index,dev->limits.pkey_table_len-1); attr->pkey_index,dev->limits.pkey_table_len-1);
return -EINVAL; return -EINVAL;
} }
@@ -733,7 +733,7 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
if (attr_mask & IB_QP_RNR_RETRY) { if (attr_mask & IB_QP_RNR_RETRY) {
qp_context->alt_path.rnr_retry = qp_context->pri_path.rnr_retry = qp_context->alt_path.rnr_retry = qp_context->pri_path.rnr_retry =
attr->rnr_retry << 5; attr->rnr_retry << 5;
qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RNR_RETRY | qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RNR_RETRY |
MTHCA_QP_OPTPAR_ALT_RNR_RETRY); MTHCA_QP_OPTPAR_ALT_RNR_RETRY);
} }
@@ -749,13 +749,13 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
if (attr_mask & IB_QP_ALT_PATH) { if (attr_mask & IB_QP_ALT_PATH) {
if (attr->alt_port_num == 0 || attr->alt_port_num > dev->limits.num_ports) { if (attr->alt_port_num == 0 || attr->alt_port_num > dev->limits.num_ports) {
mthca_dbg(dev, "Alternate port number (%u) is invalid\n", mthca_dbg(dev, "Alternate port number (%u) is invalid\n",
attr->alt_port_num); attr->alt_port_num);
return -EINVAL; return -EINVAL;
} }
mthca_path_set(&attr->alt_ah_attr, &qp_context->alt_path); mthca_path_set(&attr->alt_ah_attr, &qp_context->alt_path);
qp_context->alt_path.port_pkey |= cpu_to_be32(attr->alt_pkey_index | qp_context->alt_path.port_pkey |= cpu_to_be32(attr->alt_pkey_index |
attr->alt_port_num << 24); attr->alt_port_num << 24);
qp_context->alt_path.ackto = attr->alt_timeout << 3; qp_context->alt_path.ackto = attr->alt_timeout << 3;
qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_ALT_ADDR_PATH); qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_ALT_ADDR_PATH);
@@ -1078,10 +1078,10 @@ static int mthca_map_memfree(struct mthca_dev *dev,
if (ret) if (ret)
goto err_qpc; goto err_qpc;
ret = mthca_table_get(dev, dev->qp_table.rdb_table, ret = mthca_table_get(dev, dev->qp_table.rdb_table,
qp->qpn << dev->qp_table.rdb_shift); qp->qpn << dev->qp_table.rdb_shift);
if (ret) if (ret)
goto err_eqpc; goto err_eqpc;
} }
@@ -2115,7 +2115,7 @@ int mthca_arbel_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
int i; int i;
void *wqe; void *wqe;
spin_lock_irqsave(&qp->rq.lock, flags); spin_lock_irqsave(&qp->rq.lock, flags);
/* XXX check that state is OK to post receive */ /* XXX check that state is OK to post receive */

2
drivers/infiniband/hw/mthca/mthca_srq.c
View File

@@ -339,7 +339,7 @@ void mthca_free_srq(struct mthca_dev *dev, struct mthca_srq *srq)
int mthca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, int mthca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr,
enum ib_srq_attr_mask attr_mask) enum ib_srq_attr_mask attr_mask)
{ {
struct mthca_dev *dev = to_mdev(ibsrq->device); struct mthca_dev *dev = to_mdev(ibsrq->device);
struct mthca_srq *srq = to_msrq(ibsrq); struct mthca_srq *srq = to_msrq(ibsrq);
int ret; int ret;