2022-05-17 12:59:24

by Ke Liu

Subject: [PATCH 1/2] hwmon: 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/hwmon/hwmon.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 22de7a9e7ba7..2e2cd79d89eb 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -764,7 +764,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
"hwmon: '%s' is not a valid name attribute, please fix\n",
name);

- id = ida_simple_get(&hwmon_ida, 0, 0, GFP_KERNEL);
+ id = ida_alloc(&hwmon_ida, GFP_KERNEL);
if (id < 0)
return ERR_PTR(id);

@@ -856,7 +856,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
free_hwmon:
hwmon_dev_release(hdev);
ida_remove:
- ida_simple_remove(&hwmon_ida, id);
+ ida_free(&hwmon_ida, id);
return ERR_PTR(err);
}

@@ -968,7 +968,7 @@ void hwmon_device_unregister(struct device *dev)

if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {
device_unregister(dev);
- ida_simple_remove(&hwmon_ida, id);
+ ida_free(&hwmon_ida, id);
} else
dev_dbg(dev->parent,
"hwmon_device_unregister() failed: bad class ID!\n");
--
2.25.1

2022-05-18 03:53:53

by Guenter Roeck

Subject: Re: [PATCH 1/2] hwmon: Directly use ida_alloc()/free()

On Tue, May 17, 2022 at 06:31:25AM +0000, keliu wrote:
> Use ida_alloc()/ida_free() instead of deprecated
> ida_simple_get()/ida_simple_remove() .
>
> Signed-off-by: keliu <[email protected]>

Applied.

Thanks,
Guenter

> ---
> drivers/hwmon/hwmon.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
> index 22de7a9e7ba7..2e2cd79d89eb 100644
> --- a/drivers/hwmon/hwmon.c
> +++ b/drivers/hwmon/hwmon.c
> @@ -764,7 +764,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
> "hwmon: '%s' is not a valid name attribute, please fix\n",
> name);
>
> - id = ida_simple_get(&hwmon_ida, 0, 0, GFP_KERNEL);
> + id = ida_alloc(&hwmon_ida, GFP_KERNEL);
> if (id < 0)
> return ERR_PTR(id);
>
> @@ -856,7 +856,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
> free_hwmon:
> hwmon_dev_release(hdev);
> ida_remove:
> - ida_simple_remove(&hwmon_ida, id);
> + ida_free(&hwmon_ida, id);
> return ERR_PTR(err);
> }
>
> @@ -968,7 +968,7 @@ void hwmon_device_unregister(struct device *dev)
>
> if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {
> device_unregister(dev);
> - ida_simple_remove(&hwmon_ida, id);
> + ida_free(&hwmon_ida, id);
> } else
> dev_dbg(dev->parent,
> "hwmon_device_unregister() failed: bad class ID!\n");