Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax

Pull IDA updates from Matthew Wilcox:
 "A better IDA API:

      id = ida_alloc(ida, GFP_xxx);
      ida_free(ida, id);

  rather than the cumbersome ida_simple_get(), ida_simple_remove().

  The new IDA API is similar to ida_simple_get() but better named.  The
  internal restructuring of the IDA code removes the bitmap
  preallocation nonsense.

  I hope the net -200 lines of code is convincing"

* 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax: (29 commits)
  ida: Change ida_get_new_above to return the id
  ida: Remove old API
  test_ida: check_ida_destroy and check_ida_alloc
  test_ida: Convert check_ida_conv to new API
  test_ida: Move ida_check_max
  test_ida: Move ida_check_leaf
  idr-test: Convert ida_check_nomem to new API
  ida: Start new test_ida module
  target/iscsi: Allocate session IDs from an IDA
  iscsi target: fix session creation failure handling
  drm/vmwgfx: Convert to new IDA API
  dmaengine: Convert to new IDA API
  ppc: Convert vas ID allocation to new IDA API
  media: Convert entity ID allocation to new IDA API
  ppc: Convert mmu context allocation to new IDA API
  Convert net_namespace to new IDA API
  cb710: Convert to new IDA API
  rsxx: Convert to new IDA API
  osd: Convert to new IDA API
  sd: Convert to new IDA API
  ...

1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index b7d71914a32a..f2c631ce793c 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 ------------------- */
 
@@ -771,19 +770,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_alloc(&rsxx_disk_ida, GFP_KERNEL);
+        if (st < 0)
                 goto failed_ida_get;
+        card->disk_id = st;
 
         st = pci_enable_device(dev);
         if (st)
@@ -985,9 +975,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_free(&rsxx_disk_ida, card->disk_id);
 failed_ida_get:
         kfree(card);
 
@@ -1050,6 +1038,7 @@ static void rsxx_pci_remove(struct pci_dev *dev)
         pci_disable_device(dev);
         pci_release_regions(dev);
 
+        ida_free(&rsxx_disk_ida, card->disk_id);
         kfree(card);
 }