ACPI: scan: Use ida_alloc() instead of ida_simple_get()

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>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 457e11d..628bf8f 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/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;

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1331756..5fa34f5 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -477,7 +477,8 @@ static void acpi_device_del(struct acpi_device *device)
        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 acpi_device *device,
        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;