lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] drivers: fsi: Directly use ida_alloc()/free()
From
Le 27/05/2022 à 13:29, 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/fsi/fsi-core.c | 12 ++++++------
> drivers/fsi/fsi-occ.c | 19 ++++++++++---------
> 2 files changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
> index 3a7b78e36701..a85f97a9ddf0 100644
> --- a/drivers/fsi/fsi-core.c
> +++ b/drivers/fsi/fsi-core.c
> @@ -951,7 +951,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
> if (cid >= 0 && cid < 16 && type < 4) {
> /* Try reserving the legacy number */
> id = (cid << 4) | type;
> - id = ida_simple_get(&fsi_minor_ida, id, id + 1, GFP_KERNEL);
> + id = ida_alloc_range(&fsi_minor_ida, id, id, GFP_KERNEL);

This one looks fine...

> if (id >= 0) {
> *out_index = fsi_adjust_index(cid);
> *out_dev = fsi_base_dev + id;
> @@ -962,7 +962,7 @@ static int __fsi_get_new_minor(struct fsi_slave *slave, enum fsi_dev_type type,
> return id;
> /* Fallback to non-legacy allocation */
> }
> - id = ida_simple_get(&fsi_minor_ida, FSI_CHAR_LEGACY_TOP,
> + id = ida_alloc_range(&fsi_minor_ida, FSI_CHAR_LEGACY_TOP,
> FSI_CHAR_MAX_DEVICES, GFP_KERNEL);

...but you missed this one.

> if (id < 0)
> return id;
> @@ -980,7 +980,7 @@ EXPORT_SYMBOL_GPL(fsi_get_new_minor);
>
> void fsi_free_minor(dev_t dev)
> {
> - ida_simple_remove(&fsi_minor_ida, MINOR(dev));
> + ida_free(&fsi_minor_ida, MINOR(dev));
> }
> EXPORT_SYMBOL_GPL(fsi_free_minor);
>
> @@ -1313,13 +1313,13 @@ int fsi_master_register(struct fsi_master *master)
> struct device_node *np;
>
> mutex_init(&master->scan_lock);
> - master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL);
> + master->idx = ida_alloc_max(&master_ida, INT_MAX - 1, GFP_KERNEL);
> dev_set_name(&master->dev, "fsi%d", master->idx);
> master->dev.class = &fsi_master_class;
>
> rc = device_register(&master->dev);
> if (rc) {
> - ida_simple_remove(&master_ida, master->idx);
> + ida_free(&master_ida, master->idx);
> return rc;
> }
>
> @@ -1337,7 +1337,7 @@ EXPORT_SYMBOL_GPL(fsi_master_register);
> void fsi_master_unregister(struct fsi_master *master)
> {
> if (master->idx >= 0) {
> - ida_simple_remove(&master_ida, master->idx);
> + ida_free(&master_ida, master->idx);
> master->idx = -1;
> }
>
> diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c
> index c9cc75fbdfb9..9240eb0379d7 100644
> --- a/drivers/fsi/fsi-occ.c
> +++ b/drivers/fsi/fsi-occ.c
> @@ -630,17 +630,18 @@ static int occ_probe(struct platform_device *pdev)
> rc = of_property_read_u32(dev->of_node, "reg", &reg);
> if (!rc) {
> /* make sure we don't have a duplicate from dts */
> - occ->idx = ida_simple_get(&occ_ida, reg, reg + 1,
> - GFP_KERNEL);
> + occ->idx = ida_alloc_range(&occ_ida, reg, reg,
> + GFP_KERNEL);
> if (occ->idx < 0)
> - occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX,
> - GFP_KERNEL);
> + occ->idx = ida_alloc_range(&occ_ida, 1,
> + INT_MAX - 1, GFP_KERNEL);

It is likely that this one could be ida_alloc_min(&occ_ida, 1,
GFP_KERNEL), but this should be double-checked to make sure I'm right.

> } else {
> - occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX,
> - GFP_KERNEL);
> + occ->idx = ida_alloc_range(&occ_ida, 1,
> + INT_MAX - 1, GFP_KERNEL);

Same here.

> }
> } else {
> - occ->idx = ida_simple_get(&occ_ida, 1, INT_MAX, GFP_KERNEL);
> + occ->idx = ida_alloc_range(&occ_ida, 1, INT_MAX - 1,
> + GFP_KERNEL);

Same here.

> }
>
> platform_set_drvdata(pdev, occ);
> @@ -654,7 +655,7 @@ static int occ_probe(struct platform_device *pdev)
> rc = misc_register(&occ->mdev);
> if (rc) {
> dev_err(dev, "failed to register miscdevice: %d\n", rc);
> - ida_simple_remove(&occ_ida, occ->idx);
> + ida_free(&occ_ida, occ->idx);
> kvfree(occ->buffer);
> return rc;
> }
> @@ -677,7 +678,7 @@ static int occ_remove(struct platform_device *pdev)
>
> device_for_each_child(&pdev->dev, NULL, occ_unregister_child);
>
> - ida_simple_remove(&occ_ida, occ->idx);
> + ida_free(&occ_ida, occ->idx);
>
> return 0;
> }

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