Prev: [PATCH v2 0/5] Generalize OF gpio support code
Next: [PATCH v2 3/5] of/gpio: stop using device_node data pointer to find gpio_chip
From: Grant Likely on 10 Jun 2010 01:50
Add of_driver_match_device() helper function. This function can be used
by bus types to determine if a driver works with a device when using OF
style matching. If CONFIG_OF is unselected, then it is a nop.

Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca>
CC: Greg Kroah-Hartman <gregkh(a)suse.de>
CC: Michal Simek <monstr(a)monstr.eu>
CC: Grant Likely <grant.likely(a)secretlab.ca>
CC: Benjamin Herrenschmidt <benh(a)kernel.crashing.org>
CC: Stephen Rothwell <sfr(a)canb.auug.org.au>
CC: linux-kernel(a)vger.kernel.org
CC: microblaze-uclinux(a)itee.uq.edu.au
CC: linuxppc-dev(a)ozlabs.org
CC: devicetree-discuss(a)lists.ozlabs.org
---
drivers/of/device.c | 2 +-
include/linux/of_device.h | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/drivers/of/device.c b/drivers/of/device.c
index c2a98f5..5282a20 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -20,7 +20,7 @@
const struct of_device_id *of_match_device(const struct of_device_id *matches,
const struct device *dev)
{
- if (!dev->of_node)
+ if ((!matches) || (!dev->of_node))
return NULL;
return of_match_node(matches, dev->of_node);
}
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 238e92e..91d75fb 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -30,6 +30,17 @@
extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct device *dev);

+/**
+ * of_driver_match_device - Tell if a driver's of_match_table matches a device.
+ * @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,
+ const struct device_driver *drv)
+{
+ return of_match_device(drv->of_match_table, dev) != NULL;
+}
+
extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev);

@@ -48,6 +59,14 @@ extern ssize_t of_device_get_modalias(struct device *dev,
extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env);


+#else /* CONFIG_OF_DEVICE */
+
+static inline int of_driver_match_device(struct device *dev,
+ struct device_driver *drv)
+{
+ return 0;
+}
+
#endif /* CONFIG_OF_DEVICE */

#endif /* _LINUX_OF_DEVICE_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH v2 0/5] Generalize OF gpio support code
Next: [PATCH v2 3/5] of/gpio: stop using device_node data pointer to find gpio_chip