* [PATCH] rpmsg: Directly use ida_alloc()/free()
@ 2022-05-27 7:51 keliu
2022-05-27 7:44 ` Christophe JAILLET
0 siblings, 1 reply; 2+ messages in thread
From: keliu @ 2022-05-27 7:51 UTC (permalink / raw)
To: bjorn.andersson, mathieu.poirier, linux-remoteproc, linux-kernel; +Cc: keliu
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);
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);
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] rpmsg: Directly use ida_alloc()/free()
2022-05-27 7:51 [PATCH] rpmsg: Directly use ida_alloc()/free() keliu
@ 2022-05-27 7:44 ` Christophe JAILLET
0 siblings, 0 replies; 2+ messages in thread
From: Christophe JAILLET @ 2022-05-27 7:44 UTC (permalink / raw)
To: keliu, bjorn.andersson, mathieu.poirier, linux-remoteproc, linux-kernel
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-27 7:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-27 7:51 [PATCH] rpmsg: Directly use ida_alloc()/free() keliu
2022-05-27 7:44 ` Christophe JAILLET
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®