svn commit: r216904 - in projects/ofed/head/sys/ofed/drivers:
infiniband/core infiniband/hw/mthca net/mlx4
Jeff Roberson
jeff at FreeBSD.org
Mon Jan 3 03:08:08 UTC 2011
Author: jeff
Date: Mon Jan 3 03:08:08 2011
New Revision: 216904
URL: http://svn.freebsd.org/changeset/base/216904
Log:
- Eliminate diffs which have been rendered unnecessary by changes in the
wrapper layer.
Sponsored by: Isilon Systems, iX Systems, and Panasas.
Modified:
projects/ofed/head/sys/ofed/drivers/infiniband/core/notice.c
projects/ofed/head/sys/ofed/drivers/infiniband/core/ucma.c
projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c
projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_av.c
projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c
projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h
projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_mr.c
projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/notice.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/core/notice.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/core/notice.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -669,7 +669,7 @@ static void inform_add_one(struct ib_dev
if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
return;
- dev = kzalloc(sizeof *dev + device->phys_port_cnt * sizeof *port,
+ dev = kmalloc(sizeof *dev + device->phys_port_cnt * sizeof *port,
GFP_KERNEL);
if (!dev)
return;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/ucma.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/core/ucma.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/core/ucma.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -1255,7 +1255,7 @@ static int ucma_open(struct inode *inode
{
struct ucma_file *file;
- file = kzalloc(sizeof *file, GFP_KERNEL);
+ file = kmalloc(sizeof *file, GFP_KERNEL);
if (!file)
return -ENOMEM;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_cmd.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -498,7 +498,7 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uve
(unsigned long) cmd.response + sizeof resp,
in_len - sizeof cmd, out_len - sizeof resp);
- uobj = kzalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -619,7 +619,7 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverb
!(cmd.access_flags & IB_ACCESS_LOCAL_WRITE))
return -EINVAL;
- uobj = kzalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -779,7 +779,7 @@ ssize_t ib_uverbs_create_cq(struct ib_uv
if (cmd.comp_vector >= file->device->num_comp_vectors)
return -EINVAL;
- obj = kzalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof *obj, GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -1057,7 +1057,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uv
(unsigned long) cmd.response + sizeof resp,
in_len - sizeof cmd, out_len - sizeof resp);
- obj = kzalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof *obj, GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -1784,7 +1784,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uv
if (copy_from_user(&cmd, buf, sizeof cmd))
return -EFAULT;
- uobj = kzalloc(sizeof *uobj, GFP_KERNEL);
+ uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
if (!uobj)
return -ENOMEM;
@@ -2031,7 +2031,7 @@ ssize_t ib_uverbs_create_srq(struct ib_u
(unsigned long) cmd.response + sizeof resp,
in_len - sizeof cmd, out_len - sizeof resp);
- obj = kzalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof *obj, GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -2137,7 +2137,7 @@ ssize_t ib_uverbs_create_xrc_srq(struct
(unsigned long) cmd.response + sizeof resp,
in_len - sizeof cmd, out_len - sizeof resp);
- obj = kzalloc(sizeof *obj, GFP_KERNEL);
+ obj = kmalloc(sizeof *obj, GFP_KERNEL);
if (!obj)
return -ENOMEM;
@@ -2507,7 +2507,7 @@ ssize_t ib_uverbs_open_xrc_domain(struct
}
}
- xrcd_uobj = kzalloc(sizeof *xrcd_uobj, GFP_KERNEL);
+ xrcd_uobj = kmalloc(sizeof *xrcd_uobj, GFP_KERNEL);
if (!xrcd_uobj) {
ret = -ENOMEM;
goto err_table_mutex_unlock;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/core/uverbs_main.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -541,7 +541,7 @@ struct file *ib_uverbs_alloc_event_file(
struct file *filp;
int ret;
- ev_file = kzalloc(sizeof *ev_file, GFP_KERNEL);
+ ev_file = kmalloc(sizeof *ev_file, GFP_KERNEL);
if (!ev_file)
return ERR_PTR(-ENOMEM);
@@ -685,7 +685,7 @@ static int ib_uverbs_open(struct inode *
goto err;
}
- file = kzalloc(sizeof *file, GFP_KERNEL);
+ file = kmalloc(sizeof *file, GFP_KERNEL);
if (!file) {
ret = -ENOMEM;
goto err_module;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_av.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_av.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_av.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -172,10 +172,8 @@ int mthca_create_ah(struct mthca_dev *de
index = mthca_alloc(&dev->av_table.alloc);
/* fall back to allocate in host memory */
- if (index == -1) {
- printf("av_table alloc fail\n");
+ if (index == -1)
goto on_hca_fail;
- }
av = kmalloc(sizeof *av, GFP_ATOMIC);
if (!av)
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_cmd.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -720,8 +720,7 @@ static void mthca_setup_cmd_doorbells(st
addr = pci_resource_start(dev->pdev, 2) +
((pci_resource_len(dev->pdev, 2) - 1) & base);
- dev->cmd.dbell_size = max_off + sizeof(u32);
- dev->cmd.dbell_map = ioremap(addr, dev->cmd.dbell_size);
+ dev->cmd.dbell_map = ioremap(addr, max_off + sizeof(u32));
if (!dev->cmd.dbell_map)
return;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_dev.h Mon Jan 3 03:08:08 2011 (r216904)
@@ -128,7 +128,6 @@ struct mthca_cmd {
struct mthca_cmd_context *context;
u16 token_mask;
u32 flags;
- u32 dbell_size;
void __iomem *dbell_map;
u16 dbell_offsets[MTHCA_CMD_NUM_DBELL_DWORDS];
};
@@ -221,8 +220,6 @@ struct mthca_mr_table {
void __iomem *mpt_base;
void __iomem *mtt_base;
struct mthca_buddy mtt_buddy;
- u32 mtt_size;
- u32 mpt_size;
} tavor_fmr;
};
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_mr.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_mr.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_mr.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -893,10 +893,9 @@ int mthca_init_mr_table(struct mthca_dev
addr = pci_resource_start(dev->pdev, 4) +
((pci_resource_len(dev->pdev, 4) - 1) &
dev->mr_table.mpt_base);
- dev->mr_table.tavor_fmr.mpt_size =
- mpts * sizeof(struct mthca_mpt_entry);
+
dev->mr_table.tavor_fmr.mpt_base =
- ioremap(addr, dev->mr_table.tavor_fmr.mpt_size);
+ ioremap(addr, mpts * sizeof(struct mthca_mpt_entry));
if (!dev->mr_table.tavor_fmr.mpt_base) {
mthca_warn(dev, "MPT ioremap for FMR failed.\n");
@@ -907,10 +906,9 @@ int mthca_init_mr_table(struct mthca_dev
addr = pci_resource_start(dev->pdev, 4) +
((pci_resource_len(dev->pdev, 4) - 1) &
dev->mr_table.mtt_base);
- dev->mr_table.tavor_fmr.mtt_size =
- mtts * dev->limits.mtt_seg_size;
+
dev->mr_table.tavor_fmr.mtt_base =
- ioremap(addr, dev->mr_table.tavor_fmr.mtt_size);
+ ioremap(addr, mtts * dev->limits.mtt_seg_size);
if (!dev->mr_table.tavor_fmr.mtt_base) {
mthca_warn(dev, "MTT ioremap for FMR failed.\n");
err = -ENOMEM;
Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -555,7 +555,7 @@ static struct ib_qp *mthca_create_qp(str
{
struct mthca_ucontext *context;
- qp = kzalloc(sizeof *qp, GFP_KERNEL);
+ qp = kmalloc(sizeof *qp, GFP_KERNEL);
if (!qp)
return ERR_PTR(-ENOMEM);
@@ -621,7 +621,7 @@ static struct ib_qp *mthca_create_qp(str
if (pd->uobject)
return ERR_PTR(-EINVAL);
- qp = kzalloc(sizeof (struct mthca_sqp), GFP_KERNEL);
+ qp = kmalloc(sizeof (struct mthca_sqp), GFP_KERNEL);
if (!qp)
return ERR_PTR(-ENOMEM);
@@ -701,7 +701,7 @@ static struct ib_cq *mthca_create_cq(str
goto err_unmap_set;
}
- cq = kzalloc(sizeof *cq, GFP_KERNEL);
+ cq = kmalloc(sizeof *cq, GFP_KERNEL);
if (!cq) {
err = -ENOMEM;
goto err_unmap_arm;
Modified: projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c Mon Jan 3 02:59:24 2011 (r216903)
+++ projects/ofed/head/sys/ofed/drivers/net/mlx4/main.c Mon Jan 3 03:08:08 2011 (r216904)
@@ -1611,7 +1611,6 @@ static int __init mlx4_init(void)
{
int ret;
- printk("mlx4 init\n");
mutex_init(&drv_mutex);
if (mlx4_verify_params())
More information about the svn-src-projects
mailing list