| Message ID | 20180704102240.2C00942D43@mail.steuer-voss.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tue, Jul 3, 2018 at 9:09 AM, Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> wrote: > When using ACPI with ACPI_DT_NAMESPACE_HID/ PRP0001 HID and referring to > of_device_id table "compatible" strings in DSD, a pointer to the > corresponding DT table entry should be returned instead of a null > pointer. An acpi_device_id match still takes precedence. AFAIU it's just bounce for new comers to the discussion. The patch is in its original form and didn't incorporate any review comments so far. > Signed-off-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > --- > drivers/acpi/bus.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index 84b4a62018eb..c2deffea842e 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -832,13 +832,18 @@ EXPORT_SYMBOL_GPL(acpi_match_device); > > const void *acpi_device_get_match_data(const struct device *dev) > { > - const struct acpi_device_id *match; > + const struct acpi_device_id *acpi_id = NULL; > + const struct of_device_id *of_id = NULL; > + const struct device_driver *drv = dev->driver; > > - match = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (!match) > + __acpi_match_device(acpi_companion_match(dev), drv->acpi_match_table, > + drv->of_match_table, &acpi_id, &of_id); > + if (acpi_id) > + return (const void*)acpi_id->driver_data; > + else if (of_id) > + return (const void*)of_id->data; > + else > return NULL; > - > - return (const void *)match->driver_data; > } > EXPORT_SYMBOL_GPL(acpi_device_get_match_data); > > -- > 2.17.1 >
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 84b4a62018eb..c2deffea842e 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -832,13 +832,18 @@ EXPORT_SYMBOL_GPL(acpi_match_device); const void *acpi_device_get_match_data(const struct device *dev) { - const struct acpi_device_id *match; + const struct acpi_device_id *acpi_id = NULL; + const struct of_device_id *of_id = NULL; + const struct device_driver *drv = dev->driver; - match = acpi_match_device(dev->driver->acpi_match_table, dev); - if (!match) + __acpi_match_device(acpi_companion_match(dev), drv->acpi_match_table, + drv->of_match_table, &acpi_id, &of_id); + if (acpi_id) + return (const void*)acpi_id->driver_data; + else if (of_id) + return (const void*)of_id->data; + else return NULL; - - return (const void *)match->driver_data; } EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
When using ACPI with ACPI_DT_NAMESPACE_HID/ PRP0001 HID and referring to of_device_id table "compatible" strings in DSD, a pointer to the corresponding DT table entry should be returned instead of a null pointer. An acpi_device_id match still takes precedence. Signed-off-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> --- drivers/acpi/bus.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)