diff options
author | Alexander Chiang <achiang@hp.com> | 2010-02-02 14:08:04 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2010-02-24 13:23:40 -0500 |
commit | ddbd6883013dcc9f9ca5c0b26f79d9334a95926c (patch) | |
tree | 755aa7301cab6a8ed417b55c7d8cd3c7b721e99d /drivers/infiniband | |
parent | 38707980c42c58e2d00b34ecaa40cf5207bdd9d1 (diff) |
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: Alex Chiang <achiang@hp.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/core/uverbs_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index acae9ed05728..8c594cde8a1d 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
@@ -731,6 +731,7 @@ static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL); | |||
731 | static void ib_uverbs_add_one(struct ib_device *device) | 731 | static void ib_uverbs_add_one(struct ib_device *device) |
732 | { | 732 | { |
733 | int devnum; | 733 | int devnum; |
734 | dev_t base; | ||
734 | struct ib_uverbs_device *uverbs_dev; | 735 | struct ib_uverbs_device *uverbs_dev; |
735 | 736 | ||
736 | if (!device->alloc_ucontext) | 737 | if (!device->alloc_ucontext) |
@@ -750,6 +751,7 @@ static void ib_uverbs_add_one(struct ib_device *device) | |||
750 | goto err; | 751 | goto err; |
751 | } | 752 | } |
752 | uverbs_dev->devnum = devnum; | 753 | uverbs_dev->devnum = devnum; |
754 | base = devnum + IB_UVERBS_BASE_DEV; | ||
753 | set_bit(devnum, dev_map); | 755 | set_bit(devnum, dev_map); |
754 | spin_unlock(&map_lock); | 756 | spin_unlock(&map_lock); |
755 | 757 | ||
@@ -760,7 +762,7 @@ static void ib_uverbs_add_one(struct ib_device *device) | |||
760 | uverbs_dev->cdev.owner = THIS_MODULE; | 762 | uverbs_dev->cdev.owner = THIS_MODULE; |
761 | uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops; | 763 | uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops; |
762 | kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum); | 764 | kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum); |
763 | if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + devnum, 1)) | 765 | if (cdev_add(&uverbs_dev->cdev, base, 1)) |
764 | goto err_cdev; | 766 | goto err_cdev; |
765 | 767 | ||
766 | uverbs_dev->dev = device_create(uverbs_class, device->dma_device, | 768 | uverbs_dev->dev = device_create(uverbs_class, device->dma_device, |