Commit ddbd6883 authored by Alexander Chiang's avatar Alexander Chiang Committed by Roland Dreier

IB/uverbs: use stack variable 'base' in ib_uverbs_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_UVERBS_MAX_DEVICES in a system.
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 38707980
...@@ -731,6 +731,7 @@ static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL); ...@@ -731,6 +731,7 @@ static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
static void ib_uverbs_add_one(struct ib_device *device) static void ib_uverbs_add_one(struct ib_device *device)
{ {
int devnum; int devnum;
dev_t base;
struct ib_uverbs_device *uverbs_dev; struct ib_uverbs_device *uverbs_dev;
if (!device->alloc_ucontext) if (!device->alloc_ucontext)
...@@ -750,6 +751,7 @@ static void ib_uverbs_add_one(struct ib_device *device) ...@@ -750,6 +751,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
goto err; goto err;
} }
uverbs_dev->devnum = devnum; uverbs_dev->devnum = devnum;
base = devnum + IB_UVERBS_BASE_DEV;
set_bit(devnum, dev_map); set_bit(devnum, dev_map);
spin_unlock(&map_lock); spin_unlock(&map_lock);
...@@ -760,7 +762,7 @@ static void ib_uverbs_add_one(struct ib_device *device) ...@@ -760,7 +762,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
uverbs_dev->cdev.owner = THIS_MODULE; uverbs_dev->cdev.owner = THIS_MODULE;
uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops; uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;
kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum); kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum);
if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + devnum, 1)) if (cdev_add(&uverbs_dev->cdev, base, 1))
goto err_cdev; goto err_cdev;
uverbs_dev->dev = device_create(uverbs_class, device->dma_device, uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment