2022-05-17 12:57:33

by Ke Liu

Subject: [PATCH 2/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/ibmaem.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
index de6baf6ca3d1..5c4cf742f5ae 100644
--- a/drivers/hwmon/ibmaem.c
+++ b/drivers/hwmon/ibmaem.c
@@ -482,7 +482,7 @@ static void aem_delete(struct aem_data *data)
ipmi_destroy_user(data->ipmi.user);
platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev);
- ida_simple_remove(&aem_ida, data->id);
+ ida_free(&aem_ida, data->id);
kfree(data);
}

@@ -539,7 +539,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;

/* Create sub-device for this fw instance */
- data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
+ data->id = ida_alloc(&aem_ida, GFP_KERNEL);
if (data->id < 0)
goto id_err;

@@ -600,7 +600,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev);
dev_err:
- ida_simple_remove(&aem_ida, data->id);
+ ida_free(&aem_ida, data->id);
id_err:
kfree(data);

@@ -679,7 +679,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;

/* Create sub-device for this fw instance */
- data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
+ data->id = ida_alloc(&aem_ida, GFP_KERNEL);
if (data->id < 0)
goto id_err;

@@ -740,7 +740,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev);
dev_err:
- ida_simple_remove(&aem_ida, data->id);
+ ida_free(&aem_ida, data->id);
id_err:
kfree(data);

--
2.25.1

2022-05-17 18:18:14

by Guenter Roeck

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

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

Applied, after updating subject to include the driver name.

Guenter

> ---
> drivers/hwmon/ibmaem.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
> index de6baf6ca3d1..5c4cf742f5ae 100644
> --- a/drivers/hwmon/ibmaem.c
> +++ b/drivers/hwmon/ibmaem.c
> @@ -482,7 +482,7 @@ static void aem_delete(struct aem_data *data)
> ipmi_destroy_user(data->ipmi.user);
> platform_set_drvdata(data->pdev, NULL);
> platform_device_unregister(data->pdev);
> - ida_simple_remove(&aem_ida, data->id);
> + ida_free(&aem_ida, data->id);
> kfree(data);
> }
>
> @@ -539,7 +539,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
> data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
>
> /* Create sub-device for this fw instance */
> - data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
> + data->id = ida_alloc(&aem_ida, GFP_KERNEL);
> if (data->id < 0)
> goto id_err;
>
> @@ -600,7 +600,7 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle)
> platform_set_drvdata(data->pdev, NULL);
> platform_device_unregister(data->pdev);
> dev_err:
> - ida_simple_remove(&aem_ida, data->id);
> + ida_free(&aem_ida, data->id);
> id_err:
> kfree(data);
>
> @@ -679,7 +679,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
> data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
>
> /* Create sub-device for this fw instance */
> - data->id = ida_simple_get(&aem_ida, 0, 0, GFP_KERNEL);
> + data->id = ida_alloc(&aem_ida, GFP_KERNEL);
> if (data->id < 0)
> goto id_err;
>
> @@ -740,7 +740,7 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe,
> platform_set_drvdata(data->pdev, NULL);
> platform_device_unregister(data->pdev);
> dev_err:
> - ida_simple_remove(&aem_ida, data->id);
> + ida_free(&aem_ida, data->id);
> id_err:
> kfree(data);
>