Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1237658

[PATCH 2/5] block: rsxx: core: simplify ida usage

Show all headers | View raw

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] Modify ida_* users to use ida_simple_* Lee Duncan <lduncan@suse.com> - 2015-10-01 21:00 +0200
  [PATCH 2/5] block: rsxx: core: simplify ida usage Lee Duncan <lduncan@suse.com> - 2015-10-01 21:10 +0200
  [PATCH 4/5] block: mtip32xx: simplify ida usage Lee Duncan <lduncan@suse.com> - 2015-10-01 21:10 +0200
  [PATCH 5/5] base: soc: siplify ida usage Lee Duncan <lduncan@suse.com> - 2015-10-01 21:10 +0200
  [PATCH 1/5] SCSI: sd: simplify ida usage Lee Duncan <lduncan@suse.com> - 2015-10-01 21:10 +0200
  [PATCH 3/5] block: nvme-core: simplify ida usage Lee Duncan <lduncan@suse.com> - 2015-10-01 21:10 +0200
  Re: [PATCH 0/5] Modify ida_* users to use ida_simple_* Tejun Heo <tj@kernel.org> - 2015-10-05 19:50 +0200
    Re: [PATCH 0/5] Modify ida_* users to use ida_simple_* James Bottomley <James.Bottomley@HansenPartnership.com> - 2015-10-05 20:00 +0200

csiph-web