summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Chiang <achiang@hp.com>2010-02-02 19:09:00 +0000
committerRoland Dreier <rolandd@cisco.com>2010-02-24 10:23:47 -0800
commit31d14b6e10657113f72d496121d52ca779156b2e (patch)
tree72bd20cc099892eb5941cae11f02a6a5011c2997
parentdd08f702dd773004b81aeddcd120b052a42710c3 (diff)
downloadop-kernel-dev-31d14b6e10657113f72d496121d52ca779156b2e.zip
op-kernel-dev-31d14b6e10657113f72d496121d52ca779156b2e.tar.gz
IB/ucm: Use stack variable 'base' in ib_ucm_add_one
This change is not useful by itself, but sets us up for a future change that allows us to support more than IB_UCM_MAX_DEVICES. Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/core/ucm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 7ff3300..06c50d8 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1240,6 +1240,7 @@ static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);
static void ib_ucm_add_one(struct ib_device *device)
{
int devnum;
+ dev_t base;
struct ib_ucm_device *ucm_dev;
if (!device->alloc_ucontext ||
@@ -1257,12 +1258,13 @@ static void ib_ucm_add_one(struct ib_device *device)
goto err;
ucm_dev->devnum = devnum;
+ base = devnum + IB_UCM_BASE_DEV;
set_bit(devnum, dev_map);
cdev_init(&ucm_dev->cdev, &ucm_fops);
ucm_dev->cdev.owner = THIS_MODULE;
kobject_set_name(&ucm_dev->cdev.kobj, "ucm%d", ucm_dev->devnum);
- if (cdev_add(&ucm_dev->cdev, IB_UCM_BASE_DEV + devnum, 1))
+ if (cdev_add(&ucm_dev->cdev, base, 1))
goto err;
ucm_dev->dev.class = &cm_class;
OpenPOWER on IntegriCloud