hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (ibmaem) Directly use ida_alloc()/free() 

Use ida_alloc()/ida_free() instead of deprecated
ida_simple_get()/ida_simple_remove() .

Signed-off-by: keliu <liuke94@huawei.com>
Link: https://lore.kernel.org/r/20220517063126.2142637-2-liuke94@huawei.com
[groeck: Updated subject to include driver name]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
keliu 2022-05-17 06:31:26 +00:00 committed by Guenter Roeck
parent 718fbfa5da
commit be1ca367e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/hwmon/ibmaem.c
View File

@ -482,7 +482,7 @@ static void aem_delete(struct aem_data *data)
ipmi_destroy_user(data->ipmi.user); ipmi_destroy_user(data->ipmi.user);
platform_set_drvdata(data->pdev, NULL); platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev); platform_device_unregister(data->pdev);
ida_simple_remove(&aem_ida, data->id); ida_free(&aem_ida, data->id);
kfree(data); 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; data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
/* Create sub-device for this fw instance */ /* 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) if (data->id < 0)
goto id_err; goto id_err;
@ -600,7 +600,7 @@ ipmi_err:
platform_set_drvdata(data->pdev, NULL); platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev); platform_device_unregister(data->pdev);
dev_err: dev_err:
ida_simple_remove(&aem_ida, data->id); ida_free(&aem_ida, data->id);
id_err: id_err:
kfree(data); 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; data->power_period[i] = AEM_DEFAULT_POWER_INTERVAL;
/* Create sub-device for this fw instance */ /* 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) if (data->id < 0)
goto id_err; goto id_err;
@ -740,7 +740,7 @@ ipmi_err:
platform_set_drvdata(data->pdev, NULL); platform_set_drvdata(data->pdev, NULL);
platform_device_unregister(data->pdev); platform_device_unregister(data->pdev);
dev_err: dev_err:
ida_simple_remove(&aem_ida, data->id); ida_free(&aem_ida, data->id);
id_err: id_err:
kfree(data); kfree(data);