rpmsg: Directly use ida_alloc()/free()
PATCH 1/1 rpmsg: Directly use ida_alloc()/free()
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .
Signed-off-by keliu <[email protected]>
--- drivers/rpmsg/rpmsg_char.c | 10 +++++----- drivers/rpmsg/rpmsg_ctrl.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/rpmsg/rpmsg_char.c +5 -5
@@ -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_chareturn 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);
drivers/rpmsg/rpmsg_ctrl.c +5 -5
@@ -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);
Signature · 1 line
2.25.1
Le 27/05/2022 à 09:51, keliu a écrit :
Quoted 25 lines
Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .Signed-off-by keliu <[email protected]>--- drivers/rpmsg/rpmsg_char.c | 10 +++++----- drivers/rpmsg/rpmsg_ctrl.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)drivers/rpmsg/rpmsg_char.c +2
-2@@ -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); }
drivers/rpmsg/rpmsg_char.c static int rpmsg_chrdev_eptdev_add(struct rpmsg_eptdev *eptdev, struct rpmsg_cha · line 392
Quoted 5 lines
drivers/rpmsg/rpmsg_char.c +1
-1@@ -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
Quoted 51 lines
drivers/rpmsg/rpmsg_char.c +2
-2if (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_chareturn 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);drivers/rpmsg/rpmsg_ctrl.c +5
-5@@ -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);