[PATCH V6 2/7] ACPI / bus: Introduce acpi_get_match_data() function
From: rafael@kernel.org (Rafael J. Wysocki)
Date: 2017-12-05 22:04:25
Also in:
linux-acpi, linux-arm-msm, linux-devicetree, lkml
On Tue, Dec 5, 2017 at 6:04 PM, Sinan Kaya [off-list ref] 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 <redacted> Acked-by: Rafael J. Wysocki <redacted>
Not sure yet, sorry.
quoted hunk ↗ jump to hunk
--- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+)diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 4d0979e..b271eb1 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c@@ -785,6 +785,18 @@ 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; + + match = acpi_match_device(dev->driver->acpi_match_table, dev);
Shouldn't this check dev->driver against NULL before dereferencing it?
quoted hunk ↗ jump to hunk
+ 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) { --1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html