hwmon: Directly use ida_alloc()/free()
PATCH 1/1 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 +++--- drivers/hwmon/ibmaem.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/hwmon/hwmon.c +3 -3
@@ -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" );
drivers/hwmon/ibmaem.c +5 -5
@@ -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);
Signature · 1 line
2.25.1
Guenter Roeck
maintainerQuoted 7 lines · keliu
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 +++--- drivers/hwmon/ibmaem.c | 10 +++++-----
One patch per file, please.
Guenter
Quoted 82 lines
2 files changed, 8 insertions(+), 8 deletions(-)drivers/hwmon/hwmon.c +3
-3@@ -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" );drivers/hwmon/ibmaem.c +5
-5@@ -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);