base: soc: siplify ida usage

Simplify ida index allocation and removal by
using the ida_simple_* helper functions

Signed-off-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index 39fca01c8fa1..75b98aad6faf 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -16,7 +16,6 @@
 #include <linux/err.h>
 
 static DEFINE_IDA(soc_ida);
-static DEFINE_SPINLOCK(soc_lock);
 
 static ssize_t soc_info_get(struct device *dev,
                             struct device_attribute *attr,
@@ -122,20 +121,10 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr
         }
 
         /* Fetch a unique (reclaimable) SOC ID. */
-        do {
-                if (!ida_pre_get(&soc_ida, GFP_KERNEL)) {
-                        ret = -ENOMEM;
-                        goto out2;
-                }
-
-                spin_lock(&soc_lock);
-                ret = ida_get_new(&soc_ida, &soc_dev->soc_dev_num);
-                spin_unlock(&soc_lock);
-
-        } while (ret == -EAGAIN);
-
-        if (ret)
+        ret = ida_simple_get(&soc_ida, 0, 0, GFP_KERNEL);
+        if (ret < 0)
                 goto out2;
+        soc_dev->soc_dev_num = ret;
 
         soc_dev->attr = soc_dev_attr;
         soc_dev->dev.bus = &soc_bus_type;
@@ -151,7 +140,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr
         return soc_dev;
 
 out3:
-        ida_remove(&soc_ida, soc_dev->soc_dev_num);
+        ida_simple_remove(&soc_ida, soc_dev->soc_dev_num);
 out2:
         kfree(soc_dev);
 out1:
@@ -161,7 +150,7 @@ out1:
 /* Ensure soc_dev->attr is freed prior to calling soc_device_unregister. */
 void soc_device_unregister(struct soc_device *soc_dev)
 {
-        ida_remove(&soc_ida, soc_dev->soc_dev_num);
+        ida_simple_remove(&soc_ida, soc_dev->soc_dev_num);
 
         device_unregister(&soc_dev->dev);
 }