From: Lee Duncan <lduncan@suse.com>
To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Lee Duncan <lduncan@suse.com>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Tejun Heo <tj@kernel.org>, Hannes Reinecke <hare@suse.com>,
Johannes Thumshirn <jthumshirn@suse.de>,
Christoph Hellwig <hch@infradead.org>,
Joshua Morris <josh.h.morris@us.ibm.com>,
Philip Kelleher <pjk1939@linux.vnet.ibm.com>
Subject: [PATCH 2/5] block: rsxx: core: simplify ida usage
Date: Thu, 1 Oct 2015 11:59:06 -0700 [thread overview]
Message-ID: <8d2f1dca7162a499d82de53be88110695334d8ef.1443723136.git.lduncan@suse.com> (raw)
In-Reply-To: <cover.1443723136.git.lduncan@suse.com>
In-Reply-To: <cover.1443723136.git.lduncan@suse.com>
Simplify ida index allocation and removal by
using the ida_simple_* helper functions.
Signed-off-by: Lee Duncan <lduncan@suse.com>
---
drivers/block/rsxx/core.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index d8b2488aaade..d2279a759b2e 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -58,7 +58,6 @@ MODULE_PARM_DESC(sync_start, "On by Default: Driver load will not complete "
"until the card startup has completed.");
static DEFINE_IDA(rsxx_disk_ida);
-static DEFINE_SPINLOCK(rsxx_ida_lock);
/* --------------------Debugfs Setup ------------------- */
@@ -774,19 +773,10 @@ static int rsxx_pci_probe(struct pci_dev *dev,
card->dev = dev;
pci_set_drvdata(dev, card);
- do {
- if (!ida_pre_get(&rsxx_disk_ida, GFP_KERNEL)) {
- st = -ENOMEM;
- goto failed_ida_get;
- }
-
- spin_lock(&rsxx_ida_lock);
- st = ida_get_new(&rsxx_disk_ida, &card->disk_id);
- spin_unlock(&rsxx_ida_lock);
- } while (st == -EAGAIN);
-
- if (st)
+ st = ida_simple_get(&rsxx_disk_ida, 0, 0, GFP_KERNEL);
+ if (st < 0)
goto failed_ida_get;
+ card->disk_id = st;
st = pci_enable_device(dev);
if (st)
@@ -987,9 +977,7 @@ failed_request_regions:
failed_dma_mask:
pci_disable_device(dev);
failed_enable:
- spin_lock(&rsxx_ida_lock);
- ida_remove(&rsxx_disk_ida, card->disk_id);
- spin_unlock(&rsxx_ida_lock);
+ ida_simple_remove(&rsxx_disk_ida, card->disk_id);
failed_ida_get:
kfree(card);
--
2.1.4
next prev parent reply other threads:[~2015-10-01 18:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-01 18:59 [PATCH 0/5] Modify ida_* users to use ida_simple_* Lee Duncan
2015-10-01 18:59 ` [PATCH 1/5] SCSI: sd: simplify ida usage Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-01 18:59 ` Lee Duncan [this message]
2015-10-02 10:15 ` [PATCH 2/5] block: rsxx: core: " Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 3/5] block: nvme-core: " Lee Duncan
2015-10-02 10:15 ` Johannes Thumshirn
2015-10-08 14:29 ` Keith Busch
2015-10-01 18:59 ` [PATCH 4/5] block: mtip32xx: " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-01 18:59 ` [PATCH 5/5] base: soc: siplify " Lee Duncan
2015-10-02 10:16 ` Johannes Thumshirn
2015-10-05 17:44 ` [PATCH 0/5] Modify ida_* users to use ida_simple_* Tejun Heo
2015-10-05 17:52 ` James Bottomley
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=8d2f1dca7162a499d82de53be88110695334d8ef.1443723136.git.lduncan@suse.com \
--to=lduncan@suse.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hare@suse.com \
--cc=hch@infradead.org \
--cc=josh.h.morris@us.ibm.com \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=pjk1939@linux.vnet.ibm.com \
--cc=tj@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).