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, 18 deletions

diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 4d4acf763b65..2c43fd09d602 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -16,7 +16,6 @@
 #include <linux/gfp.h>
 
 static DEFINE_IDA(cb710_ida);
-static DEFINE_SPINLOCK(cb710_ida_lock);
 
 void cb710_pci_update_config_reg(struct pci_dev *pdev,
         int reg, uint32_t mask, uint32_t xor)
@@ -205,7 +204,6 @@ static int cb710_probe(struct pci_dev *pdev,
         const struct pci_device_id *ent)
 {
         struct cb710_chip *chip;
-        unsigned long flags;
         u32 val;
         int err;
         int n = 0;
@@ -256,18 +254,10 @@ static int cb710_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
-        do {
-                if (!ida_pre_get(&cb710_ida, GFP_KERNEL))
-                        return -ENOMEM;
-
-                spin_lock_irqsave(&cb710_ida_lock, flags);
-                err = ida_get_new(&cb710_ida, &chip->platform_id);
-                spin_unlock_irqrestore(&cb710_ida_lock, flags);
-
-                if (err && err != -EAGAIN)
-                        return err;
-        } while (err);
-
+        err = ida_alloc(&cb710_ida, GFP_KERNEL);
+        if (err < 0)
+                return err;
+        chip->platform_id = err;
 
         dev_info(&pdev->dev, "id %d, IO 0x%p, IRQ %d\n",
                 chip->platform_id, chip->iobase, pdev->irq);
@@ -308,7 +298,6 @@ unreg_mmc:
 static void cb710_remove_one(struct pci_dev *pdev)
 {
         struct cb710_chip *chip = pci_get_drvdata(pdev);
-        unsigned long flags;
 
         cb710_unregister_slot(chip, CB710_SLOT_SM);
         cb710_unregister_slot(chip, CB710_SLOT_MS);
@@ -317,9 +306,7 @@ static void cb710_remove_one(struct pci_dev *pdev)
         BUG_ON(atomic_read(&chip->slot_refs_count) != 0);
 #endif
 
-        spin_lock_irqsave(&cb710_ida_lock, flags);
-        ida_remove(&cb710_ida, chip->platform_id);
-        spin_unlock_irqrestore(&cb710_ida_lock, flags);
+        ida_free(&cb710_ida, chip->platform_id);
 }
 
 static const struct pci_device_id cb710_pci_tbl[] = {