iio: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .

Signed-off-by: keliu <liuke94@huawei.com>
Link: https://lore.kernel.org/r/20220527091739.2949426-1-liuke94@huawei.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index adf054c7a75e16cc999ef92e07b53f57e5be6669..7517deec501e92ae1636bf86ec20135c902faa3b 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1631,7 +1631,7 @@ static void iio_dev_release(struct device *device)
 
        iio_device_detach_buffers(indio_dev);
 
-       ida_simple_remove(&iio_ida, iio_dev_opaque->id);
+       ida_free(&iio_ida, iio_dev_opaque->id);
        kfree(iio_dev_opaque);
 }
 
@@ -1673,7 +1673,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
        mutex_init(&iio_dev_opaque->info_exist_lock);
        INIT_LIST_HEAD(&iio_dev_opaque->channel_attr_list);
 
-       iio_dev_opaque->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL);
+       iio_dev_opaque->id = ida_alloc(&iio_ida, GFP_KERNEL);
        if (iio_dev_opaque->id < 0) {
                /* cannot use a dev_err as the name isn't available */
                pr_err("failed to get device id\n");
@@ -1682,7 +1682,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv)
        }
 
        if (dev_set_name(&indio_dev->dev, "iio:device%d", iio_dev_opaque->id)) {
-               ida_simple_remove(&iio_ida, iio_dev_opaque->id);
+               ida_free(&iio_ida, iio_dev_opaque->id);
                kfree(iio_dev_opaque);
                return NULL;
        }

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 585b6cef8fcc6f43ac2dcdfe6827a925a3b9b3ec..1e43e93b581693f31796702cab3bc907d1f85155 100644 (file)
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -71,7 +71,7 @@ int __iio_trigger_register(struct iio_trigger *trig_info,
 
        trig_info->owner = this_mod;
 
-       trig_info->id = ida_simple_get(&iio_trigger_ida, 0, 0, GFP_KERNEL);
+       trig_info->id = ida_alloc(&iio_trigger_ida, GFP_KERNEL);
        if (trig_info->id < 0)
                return trig_info->id;
 
@@ -98,7 +98,7 @@ error_device_del:
        mutex_unlock(&iio_trigger_list_lock);
        device_del(&trig_info->dev);
 error_unregister_id:
-       ida_simple_remove(&iio_trigger_ida, trig_info->id);
+       ida_free(&iio_trigger_ida, trig_info->id);
        return ret;
 }
 EXPORT_SYMBOL(__iio_trigger_register);
@@ -109,7 +109,7 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
        list_del(&trig_info->list);
        mutex_unlock(&iio_trigger_list_lock);
 
-       ida_simple_remove(&iio_trigger_ida, trig_info->id);
+       ida_free(&iio_trigger_ida, trig_info->id);
        /* Possible issue in here */
        device_del(&trig_info->dev);
 }