lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] rpmsg: Directly use ida_alloc()/free()
From
Le 27/05/2022 à 09:51, keliu a écrit :
> Use ida_alloc()/ida_free() instead of deprecated
> ida_simple_get()/ida_simple_remove() .
>
> Signed-off-by: keliu <liuke94@huawei.com>
> ---
> drivers/rpmsg/rpmsg_char.c | 10 +++++-----
> drivers/rpmsg/rpmsg_ctrl.c | 10 +++++-----
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
> index b6183d4f62a2..7daa21d92f20 100644
> --- a/drivers/rpmsg/rpmsg_char.c
> +++ b/drivers/rpmsg/rpmsg_char.c
> @@ -342,8 +342,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);
> }
>
> @@ -389,7 +389,7 @@ static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha
> 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);


Hi,

You missed ida_simple_get() a few lines above that shoud become
ida_alloc_max() here.

CJ


> if (ret < 0)
> goto free_minor_ida;
> dev->id = ret;
> @@ -405,9 +405,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 107da70fdbaa..8418e2ea0716 100644
> --- 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);
> }
>
> @@ -161,7 +161,7 @@ static int rpmsg_ctrldev_probe(struct rpmsg_device *rpdev)
> 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);

\
 
 \ /
  Last update: 2022-05-27 09:45    [W:0.047 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site