[PATCH] ACPI: scan: Use ida_alloc() instead of ida_simple_get()

[PATCH] ACPI: scan: Use ida_alloc() instead of ida_simple_get()

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

As recommended in include/linux/idr.h, use ida_alloc() instead of
ida_simple_get() for creating unique device object names and for
symmetry replace ida_simple_remove() with ida_free() (and fix up
the related overly long code line while at it).

Also drop the ACPI_MAX_DEVICE_INSTANCES limit that is not necessary
any more and may not be sufficient for future platforms.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/internal.h |    2 --
 drivers/acpi/scan.c     |    5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

Index: linux-pm/drivers/acpi/internal.h
===================================================================
--- linux-pm.orig/drivers/acpi/internal.h
+++ linux-pm/drivers/acpi/internal.h
@@ -96,8 +96,6 @@ void acpi_scan_table_notify(void);
 
 extern struct list_head acpi_bus_id_list;
 
-#define ACPI_MAX_DEVICE_INSTANCES	4096
-
 struct acpi_device_bus_id {
 	const char *bus_id;
 	struct ida instance_ida;
Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -477,7 +477,8 @@ static void acpi_device_del(struct acpi_
 	list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node)
 		if (!strcmp(acpi_device_bus_id->bus_id,
 			    acpi_device_hid(device))) {
-			ida_simple_remove(&acpi_device_bus_id->instance_ida, device->pnp.instance_no);
+			ida_free(&acpi_device_bus_id->instance_ida,
+				 device->pnp.instance_no);
 			if (ida_is_empty(&acpi_device_bus_id->instance_ida)) {
 				list_del(&acpi_device_bus_id->node);
 				kfree_const(acpi_device_bus_id->bus_id);
@@ -642,7 +643,7 @@ static int acpi_device_set_name(struct a
 	struct ida *instance_ida = &acpi_device_bus_id->instance_ida;
 	int result;
 
-	result = ida_simple_get(instance_ida, 0, ACPI_MAX_DEVICE_INSTANCES, GFP_KERNEL);
+	result = ida_alloc(instance_ida, GFP_KERNEL);
 	if (result < 0)
 		return result;
 

Re: [PATCH] ACPI: scan: Use ida_alloc() instead of ida_simple_get()

[Andy Shevchenko]

On Thu, Feb 10, 2022 at 09:05:33PM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> As recommended in include/linux/idr.h, use ida_alloc() instead of
> ida_simple_get() for creating unique device object names and for
> symmetry replace ida_simple_remove() with ida_free() (and fix up
> the related overly long code line while at it).
> 
> Also drop the ACPI_MAX_DEVICE_INSTANCES limit that is not necessary
> any more and may not be sufficient for future platforms.

Makes sense,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>


> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>  drivers/acpi/internal.h |    2 --
>  drivers/acpi/scan.c     |    5 +++--
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> Index: linux-pm/drivers/acpi/internal.h
> ===================================================================
> --- linux-pm.orig/drivers/acpi/internal.h
> +++ linux-pm/drivers/acpi/internal.h
> @@ -96,8 +96,6 @@ void acpi_scan_table_notify(void);
>  
>  extern struct list_head acpi_bus_id_list;
>  
> -#define ACPI_MAX_DEVICE_INSTANCES	4096
> -
>  struct acpi_device_bus_id {
>  	const char *bus_id;
>  	struct ida instance_ida;
> Index: linux-pm/drivers/acpi/scan.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/scan.c
> +++ linux-pm/drivers/acpi/scan.c
> @@ -477,7 +477,8 @@ static void acpi_device_del(struct acpi_
>  	list_for_each_entry(acpi_device_bus_id, &acpi_bus_id_list, node)
>  		if (!strcmp(acpi_device_bus_id->bus_id,
>  			    acpi_device_hid(device))) {
> -			ida_simple_remove(&acpi_device_bus_id->instance_ida, device->pnp.instance_no);
> +			ida_free(&acpi_device_bus_id->instance_ida,
> +				 device->pnp.instance_no);
>  			if (ida_is_empty(&acpi_device_bus_id->instance_ida)) {
>  				list_del(&acpi_device_bus_id->node);
>  				kfree_const(acpi_device_bus_id->bus_id);
> @@ -642,7 +643,7 @@ static int acpi_device_set_name(struct a
>  	struct ida *instance_ida = &acpi_device_bus_id->instance_ida;
>  	int result;
>  
> -	result = ida_simple_get(instance_ida, 0, ACPI_MAX_DEVICE_INSTANCES, GFP_KERNEL);
> +	result = ida_alloc(instance_ida, GFP_KERNEL);
>  	if (result < 0)
>  		return result;
>  
> 
> 
> 

-- 
With Best Regards,
Andy Shevchenko