ACPI / scan: Introduce acpi_scan_match_handler()
Introduce helper routine acpi_scan_match_handler() that will find the
ACPI scan handler matching a given device ID, if there is one, and
rework acpi_scan_attach_handler() to use the new routine (that
routine will also be useful for other purposes going forward).
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Tested-by: Toshi Kani <toshi.kani@hp.com>
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 5e7e991..cc1b002 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1536,6 +1536,25 @@
return 0;
}
+static struct acpi_scan_handler *acpi_scan_match_handler(char *idstr,
+ const struct acpi_device_id **matchid)
+{
+ struct acpi_scan_handler *handler;
+
+ list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) {
+ const struct acpi_device_id *devid;
+
+ for (devid = handler->ids; devid->id[0]; devid++)
+ if (!strcmp((char *)devid->id, idstr)) {
+ if (matchid)
+ *matchid = devid;
+
+ return handler;
+ }
+ }
+ return NULL;
+}
+
static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
void *not_used, void **return_value)
{
@@ -1583,41 +1602,25 @@
return AE_OK;
}
-static int acpi_scan_do_attach_handler(struct acpi_device *device, char *id)
-{
- struct acpi_scan_handler *handler;
-
- list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) {
- const struct acpi_device_id *devid;
-
- for (devid = handler->ids; devid->id[0]; devid++) {
- int ret;
-
- if (strcmp((char *)devid->id, id))
- continue;
-
- ret = handler->attach(device, devid);
- if (ret > 0) {
- device->handler = handler;
- return ret;
- } else if (ret < 0) {
- return ret;
- }
- }
- }
- return 0;
-}
-
static int acpi_scan_attach_handler(struct acpi_device *device)
{
struct acpi_hardware_id *hwid;
int ret = 0;
list_for_each_entry(hwid, &device->pnp.ids, list) {
- ret = acpi_scan_do_attach_handler(device, hwid->id);
- if (ret)
- break;
+ const struct acpi_device_id *devid;
+ struct acpi_scan_handler *handler;
+ handler = acpi_scan_match_handler(hwid->id, &devid);
+ if (handler) {
+ ret = handler->attach(device, devid);
+ if (ret > 0) {
+ device->handler = handler;
+ break;
+ } else if (ret < 0) {
+ break;
+ }
+ }
}
return ret;
}