rpmsg: Remove usage of the deprecated ida_simple_xx() API

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_max() is inclusive. So a -1 has been added when needed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/c09ee5b66d451bf97d14c167048549aa0824ee06.1705225049.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
index 09833ad05da75cb6ca91f53e4e425cac7fad6fc9..1cb8d7474428afabc65071c2f543bb483736229c 100644 (file)
--- a/drivers/rpmsg/rpmsg_char.c
+++ b/drivers/rpmsg/rpmsg_char.c
@@ -399,8 +399,8 @@ static void rpmsg_eptdev_release_device(struct device *dev)
 {
        struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev);
 
-       ida_simple_remove(&rpmsg_ept_ida, dev->id);
-       ida_simple_remove(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
+       ida_free(&rpmsg_ept_ida, dev->id);
+       ida_free(&rpmsg_minor_ida, MINOR(eptdev->dev.devt));
        kfree(eptdev);
 }
 
@@ -441,12 +441,12 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
 
        eptdev->chinfo = chinfo;
 
-       ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL);
+       ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
        if (ret < 0)
                goto free_eptdev;
        dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
 
-       ret = ida_simple_get(&rpmsg_ept_ida, 0, 0, GFP_KERNEL);
+       ret = ida_alloc(&rpmsg_ept_ida, GFP_KERNEL);
        if (ret < 0)
                goto free_minor_ida;
        dev->id = ret;
@@ -462,9 +462,9 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
        return ret;
 
 free_ept_ida:
-       ida_simple_remove(&rpmsg_ept_ida, dev->id);
+       ida_free(&rpmsg_ept_ida, dev->id);
 free_minor_ida:
-       ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));
+       ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
 free_eptdev:
        put_device(dev);
        kfree(eptdev);

diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c
index 433253835690806a8f75749a2e2d6e79e33ab8e2..c312794ba4b3f094295bc758812b90859132fa8c 100644 (file)
--- a/drivers/rpmsg/rpmsg_ctrl.c
+++ b/drivers/rpmsg/rpmsg_ctrl.c
@@ -130,8 +130,8 @@ static void rpmsg_ctrldev_release_device(struct device *dev)
 {
        struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev);
 
-       ida_simple_remove(&rpmsg_ctrl_ida, dev->id);
-       ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));
+       ida_free(&rpmsg_ctrl_ida, dev->id);
+       ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
        kfree(ctrldev);
 }
 
@@ -156,12 +156,12 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
        cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops);
        ctrldev->cdev.owner = THIS_MODULE;
 
-       ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL);
+       ret = ida_alloc_max(&rpmsg_minor_ida, RPMSG_DEV_MAX - 1, GFP_KERNEL);
        if (ret < 0)
                goto free_ctrldev;
        dev->devt = MKDEV(MAJOR(rpmsg_major), ret);
 
-       ret = ida_simple_get(&rpmsg_ctrl_ida, 0, 0, GFP_KERNEL);
+       ret = ida_alloc(&rpmsg_ctrl_ida, GFP_KERNEL);
        if (ret < 0)
                goto free_minor_ida;
        dev->id = ret;
@@ -179,9 +179,9 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
        return ret;
 
 free_ctrl_ida:
-       ida_simple_remove(&rpmsg_ctrl_ida, dev->id);
+       ida_free(&rpmsg_ctrl_ida, dev->id);
 free_minor_ida:
-       ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt));
+       ida_free(&rpmsg_minor_ida, MINOR(dev->devt));
 free_ctrldev:
        put_device(dev);
        kfree(ctrldev);