| Message ID | 1512681031-11343-3-git-send-email-okaya@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, Dec 7, 2017 at 10:10 PM, Sinan Kaya <okaya@codeaurora.org> wrote: > OF has of_device_get_match_data() function to extract driver specific data > structure. Add a similar function for ACPI. > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/acpi/bus.c | 18 ++++++++++++++++++ > include/linux/acpi.h | 6 ++++++ > 2 files changed, 24 insertions(+) > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c > index 4d0979e..f87ed3b 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -785,6 +785,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, > } > EXPORT_SYMBOL_GPL(acpi_match_device); > > +void *acpi_get_match_data(const struct device *dev) > +{ > + const struct acpi_device_id *match; > + > + if (!dev->driver) > + return NULL; > + > + if (!dev->driver->acpi_match_table) > + return NULL; You can safely check dev->driver and this in the same statement (as long as the first check to be made is on the left). > + > + match = acpi_match_device(dev->driver->acpi_match_table, dev); > + if (!match) > + return NULL; > + > + return (void *)match->driver_data; > +} > +EXPORT_SYMBOL_GPL(acpi_get_match_data); > + > int acpi_match_device_ids(struct acpi_device *device, > const struct acpi_device_id *ids) > { > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 502af53..a927260 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), > const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, > const struct device *dev); > > +void *acpi_get_match_data(const struct device *dev); > extern bool acpi_driver_match_device(struct device *dev, > const struct device_driver *drv); > int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); > @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device( > return NULL; > } > > +static inline void *acpi_get_match_data(const struct device *dev) > +{ > + return NULL; > +} > + > static inline bool acpi_driver_match_device(struct device *dev, > const struct device_driver *drv) > { > -- But anyway Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> -- 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
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 4d0979e..f87ed3b 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -785,6 +785,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, } EXPORT_SYMBOL_GPL(acpi_match_device); +void *acpi_get_match_data(const struct device *dev) +{ + const struct acpi_device_id *match; + + if (!dev->driver) + return NULL; + + if (!dev->driver->acpi_match_table) + return NULL; + + match = acpi_match_device(dev->driver->acpi_match_table, dev); + if (!match) + return NULL; + + return (void *)match->driver_data; +} +EXPORT_SYMBOL_GPL(acpi_get_match_data); + int acpi_match_device_ids(struct acpi_device *device, const struct acpi_device_id *ids) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 502af53..a927260 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, const struct device *dev); +void *acpi_get_match_data(const struct device *dev); extern bool acpi_driver_match_device(struct device *dev, const struct device_driver *drv); int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *); @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device( return NULL; } +static inline void *acpi_get_match_data(const struct device *dev) +{ + return NULL; +} + static inline bool acpi_driver_match_device(struct device *dev, const struct device_driver *drv) {
OF has of_device_get_match_data() function to extract driver specific data structure. Add a similar function for ACPI. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/acpi/bus.c | 18 ++++++++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 24 insertions(+)