| Message ID | 1350045261-7344-2-git-send-email-tangchen@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Fri, Oct 12, 2012 at 5:34 AM, Tang Chen <tangchen@cn.fujitsu.com> wrote: > This introduce a new api to determine if a HID matches a list of IDs. > Different from acpi_match_device_ids(), the new api gets HID from > acpi_device_info struct. > > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> > --- > drivers/acpi/scan.c | 24 ++++++++++++++++++++++++ > include/acpi/acpi_bus.h | 2 ++ > 2 files changed, 26 insertions(+), 0 deletions(-) > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index 03c12e6..41fd4c9 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -312,6 +312,30 @@ int acpi_match_device_ids(struct acpi_device *device, > } > EXPORT_SYMBOL(acpi_match_device_ids); > > +int acpi_match_object_info_ids(struct acpi_device_info *info, > + const struct acpi_device_id *ids) > +{ > + char *hardware_id; > + int i, j; > + > + for (i = 0; ids[i].id[0]; i++) { > + hardware_id = info->hardware_id.string; > + if (hardware_id && > + !strcmp((char *)ids[i].id, hardware_id)) > + return 0; > + > + for (j = 0; j < info->compatible_id_list.count; j++) { > + hardware_id = info->compatible_id_list.ids[j].string; > + if (hardware_id && > + !strcmp((char *)ids[i].id, hardware_id)) > + return 0; > + } > + } > + > + return 1; -ENOENT instead of 1? > +} > +EXPORT_SYMBOL(acpi_match_object_info_ids); > + > static void acpi_free_ids(struct acpi_device *device) > { > struct acpi_hardware_id *id, *tmp; > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index f0b9681..f83d581 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -379,6 +379,8 @@ int acpi_bus_start(struct acpi_device *device); > acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); > int acpi_match_device_ids(struct acpi_device *device, > const struct acpi_device_id *ids); > +int acpi_match_object_info_ids(struct acpi_device_info *info, > + const struct acpi_device_id *ids); > int acpi_create_dir(struct acpi_device *); > void acpi_remove_dir(struct acpi_device *); > > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" 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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 03c12e6..41fd4c9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -312,6 +312,30 @@ int acpi_match_device_ids(struct acpi_device *device, } EXPORT_SYMBOL(acpi_match_device_ids); +int acpi_match_object_info_ids(struct acpi_device_info *info, + const struct acpi_device_id *ids) +{ + char *hardware_id; + int i, j; + + for (i = 0; ids[i].id[0]; i++) { + hardware_id = info->hardware_id.string; + if (hardware_id && + !strcmp((char *)ids[i].id, hardware_id)) + return 0; + + for (j = 0; j < info->compatible_id_list.count; j++) { + hardware_id = info->compatible_id_list.ids[j].string; + if (hardware_id && + !strcmp((char *)ids[i].id, hardware_id)) + return 0; + } + } + + return 1; +} +EXPORT_SYMBOL(acpi_match_object_info_ids); + static void acpi_free_ids(struct acpi_device *device) { struct acpi_hardware_id *id, *tmp; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f0b9681..f83d581 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -379,6 +379,8 @@ int acpi_bus_start(struct acpi_device *device); acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids); +int acpi_match_object_info_ids(struct acpi_device_info *info, + const struct acpi_device_id *ids); int acpi_create_dir(struct acpi_device *); void acpi_remove_dir(struct acpi_device *);
This introduce a new api to determine if a HID matches a list of IDs. Different from acpi_match_device_ids(), the new api gets HID from acpi_device_info struct. Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> --- drivers/acpi/scan.c | 24 ++++++++++++++++++++++++ include/acpi/acpi_bus.h | 2 ++ 2 files changed, 26 insertions(+), 0 deletions(-)