From: Alex Chiang <achiang@hp.com>
To: rdreier@cisco.com
Cc: linux-rdma@vger.kernel.org, justin.chen@hp.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] IB/uverbs: use stack variable 'devnum' in ib_uverbs_add_one
Date: Fri, 29 Jan 2010 14:45:13 -0700 [thread overview]
Message-ID: <20100129214512.17745.21978.stgit@bob.kio> (raw)
In-Reply-To: <20100129214039.17745.38679.stgit@bob.kio>
This change is not useful by itself, but it sets us up for a future
change that allows us to dynamically allocate device numbers in case
we have more than IB_UVERBS_MAX_DEVICES in the system.
Signed-off-by: Alex Chiang <achiang@hp.com>
---
drivers/infiniband/core/uverbs_main.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 3f11292..acae9ed 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -730,6 +730,7 @@ static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
static void ib_uverbs_add_one(struct ib_device *device)
{
+ int devnum;
struct ib_uverbs_device *uverbs_dev;
if (!device->alloc_ucontext)
@@ -743,12 +744,13 @@ static void ib_uverbs_add_one(struct ib_device *device)
init_completion(&uverbs_dev->comp);
spin_lock(&map_lock);
- uverbs_dev->devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES);
- if (uverbs_dev->devnum >= IB_UVERBS_MAX_DEVICES) {
+ devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES);
+ if (devnum >= IB_UVERBS_MAX_DEVICES) {
spin_unlock(&map_lock);
goto err;
}
- set_bit(uverbs_dev->devnum, dev_map);
+ uverbs_dev->devnum = devnum;
+ set_bit(devnum, dev_map);
spin_unlock(&map_lock);
uverbs_dev->ib_dev = device;
@@ -758,7 +760,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
uverbs_dev->cdev.owner = THIS_MODULE;
uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;
kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum);
- if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
+ if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + devnum, 1))
goto err_cdev;
uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
@@ -781,7 +783,7 @@ err_class:
err_cdev:
cdev_del(&uverbs_dev->cdev);
- clear_bit(uverbs_dev->devnum, dev_map);
+ clear_bit(devnum, dev_map);
err:
kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);
next prev parent reply other threads:[~2010-01-29 21:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-29 21:44 [PATCH 0/7] Increase maximum Infiniband HCAs per-system Alex Chiang
2010-01-29 21:44 ` Alex Chiang
2010-01-29 21:45 ` [PATCH 1/7] IB/uverbs: convert *cdev to cdev in struct ib_uverbs_device Alex Chiang
2010-01-29 21:45 ` Alex Chiang [this message]
2010-01-29 21:45 ` [PATCH 4/7] IB/uverbs: use stack variable 'base' in ib_uverbs_add_one Alex Chiang
[not found] ` <20100129214039.17745.38679.stgit-tBlMHHroXgg@public.gmane.org>
2010-01-29 21:45 ` [PATCH 2/7] IB/uverbs: remove dev_table Alex Chiang
2010-01-29 21:45 ` Alex Chiang
2010-01-29 21:45 ` [PATCH 5/7] IB/uverbs: increase maximum devices supported Alex Chiang
2010-01-29 21:45 ` Alex Chiang
2010-01-29 21:45 ` [PATCH 6/7] IB/uverbs: pack struct ib_uverbs_event_file tighter Alex Chiang
2010-01-29 21:45 ` Alex Chiang
2010-01-29 22:54 ` [PATCH 0/7] Increase maximum Infiniband HCAs per-system Roland Dreier
2010-01-29 22:54 ` Roland Dreier
[not found] ` <adar5p8ldxv.fsf-BjVyx320WGW9gfZ95n9DRSW4+XlvGpQz@public.gmane.org>
2010-01-29 23:41 ` Alex Chiang
2010-01-29 23:41 ` Alex Chiang
[not found] ` <20100129234145.GC5177-e+Ta4ugHZmL3oGB3hsPCZA@public.gmane.org>
2010-01-30 7:13 ` Roland Dreier
2010-01-30 7:13 ` Roland Dreier
2010-02-01 12:55 ` Hal Rosenstock
2010-02-01 12:55 ` Hal Rosenstock
2010-01-29 21:45 ` [PATCH 7/7] IB/core: pack struct ib_device a little tighter Alex Chiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100129214512.17745.21978.stgit@bob.kio \
--to=achiang@hp.com \
--cc=justin.chen@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=rdreier@cisco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.