Inspired from spi_get_device_match_data() helper: if OF or ACPI driver
data is available, platform_get_device_id will return NULL because
platform_match_id is not called, and pdev->id_entry is never populated.
This helper function checks if match data is available, and otherwise
returns the ID table data.
Signed-off-by: Guillaume Stols <gstols@xxxxxxxxxxxx>
---
drivers/base/platform.c | 12 ++++++++++++
include/linux/platform_device.h | 1 +
2 files changed, 13 insertions(+)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4c3ee6521ba5..26e9a026eb05 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1090,6 +1090,18 @@ static const struct platform_device_id *platform_match_id(
return NULL;
}
+const void *platform_get_device_match_data(const struct platform_device *pdev)
+{
+ const struct platform_device_id *match;
+
+ match = device_get_match_data(&pdev->dev);
+ if (match)
+ return match;
+
+ return (const void *)platform_get_device_id(pdev)->driver_data;
+}
+EXPORT_SYMBOL_GPL(platform_get_device_match_data);
+
#ifdef CONFIG_PM_SLEEP
static int platform_legacy_suspend(struct device *dev, pm_message_t mesg)
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index d422db6eec63..e2cc09ecc447 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -45,6 +45,7 @@ struct platform_device {
};
#define platform_get_device_id(pdev) ((pdev)->id_entry)
+extern const void *platform_get_device_match_data(const struct platform_device *pdev);
#define dev_is_platform(dev) ((dev)->bus == &platform_bus_type)
#define to_platform_device(x) container_of((x), struct platform_device, dev)
--
2.34.1
