drivercore/dt: add a match table pointer to struct device

Add a new .of_match field to struct device which points at the
matching device driver .of_match_table entry when a device is probed
via the device tree

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/include/linux/device.h b/include/linux/device.h
index ca5d25225aabd9ecaff16854ac483b14b3c635fa..8d8e2675d07fddaf9e161818685ea16214591646 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -441,6 +441,7 @@ struct device {
        struct dev_archdata     archdata;
 
        struct device_node      *of_node; /* associated device tree node */
+       const struct of_device_id *of_match; /* matching of_device_id from driver */
 
        dev_t                   devt;   /* dev_t, creates the sysfs "dev" */
 

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 975d347079d95ee7015e976a95888951c348a538..8bfe6c1d43654069b8fa2e1bbc61ab4d34dd4d22 100644 (file)
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -18,10 +18,11 @@ extern void of_device_make_bus_id(struct device *dev);
  * @drv: the device_driver structure to test
  * @dev: the device structure to match against
  */
-static inline int of_driver_match_device(const struct device *dev,
+static inline int of_driver_match_device(struct device *dev,
                                         const struct device_driver *drv)
 {
-       return of_match_device(drv->of_match_table, dev) != NULL;
+       dev->of_match = of_match_device(drv->of_match_table, dev);
+       return dev->of_match != NULL;
 }
 
 extern struct platform_device *of_dev_get(struct platform_device *dev);