| Message ID | 18167652.ZolVinXqGN@vostro.rjw.lan (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
2013/02/18 0:23, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Introduce new helper routine acpi_scan_handler_matching() for > checking if the given ACPI scan handler matches a given device ID > and rework acpi_scan_match_handler() to use the new routine (that > routine will also be useful for other purposes in the future). > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Thanks, Yasuaki Ishimatsu > drivers/acpi/scan.c | 30 ++++++++++++++++++++---------- > 1 file changed, 20 insertions(+), 10 deletions(-) > > Index: test/drivers/acpi/scan.c > =================================================================== > --- test.orig/drivers/acpi/scan.c > +++ test/drivers/acpi/scan.c > @@ -1658,22 +1658,32 @@ static int acpi_bus_type_and_status(acpi > return 0; > } > > +static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, > + char *idstr, > + const struct acpi_device_id **matchid) > +{ > + 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 true; > + } > + > + return false; > +} > + > 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; > + list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) > + if (acpi_scan_handler_matching(handler, idstr, matchid)) > + return handler; > > - for (devid = handler->ids; devid->id[0]; devid++) > - if (!strcmp((char *)devid->id, idstr)) { > - if (matchid) > - *matchid = devid; > - > - return handler; > - } > - } > return NULL; > } > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: test/drivers/acpi/scan.c =================================================================== --- test.orig/drivers/acpi/scan.c +++ test/drivers/acpi/scan.c @@ -1658,22 +1658,32 @@ static int acpi_bus_type_and_status(acpi return 0; } +static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, + char *idstr, + const struct acpi_device_id **matchid) +{ + 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 true; + } + + return false; +} + 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; + list_for_each_entry(handler, &acpi_scan_handlers_list, list_node) + if (acpi_scan_handler_matching(handler, idstr, matchid)) + return handler; - for (devid = handler->ids; devid->id[0]; devid++) - if (!strcmp((char *)devid->id, idstr)) { - if (matchid) - *matchid = devid; - - return handler; - } - } return NULL; }