Commit 44504b2b authored by Grant Likely's avatar Grant Likely

of: change of_match_device to work with struct device

The of_node pointer is now stored directly in struct device, so
of_match_device() should work with any device, not just struct of_device.

This patch changes the interface to of_match_device() to accept a
struct device instead of struct of_device.
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 4018294b
...@@ -39,13 +39,12 @@ static struct macio_chip *macio_on_hold; ...@@ -39,13 +39,12 @@ static struct macio_chip *macio_on_hold;
static int macio_bus_match(struct device *dev, struct device_driver *drv) static int macio_bus_match(struct device *dev, struct device_driver *drv)
{ {
struct macio_dev * macio_dev = to_macio_device(dev);
const struct of_device_id * matches = drv->of_match_table; const struct of_device_id * matches = drv->of_match_table;
if (!matches) if (!matches)
return 0; return 0;
return of_match_device(matches, &macio_dev->ofdev) != NULL; return of_match_device(matches, dev) != NULL;
} }
struct macio_dev *macio_dev_get(struct macio_dev *dev) struct macio_dev *macio_dev_get(struct macio_dev *dev)
...@@ -83,7 +82,7 @@ static int macio_device_probe(struct device *dev) ...@@ -83,7 +82,7 @@ static int macio_device_probe(struct device *dev)
macio_dev_get(macio_dev); macio_dev_get(macio_dev);
match = of_match_device(drv->driver.of_match_table, &macio_dev->ofdev); match = of_match_device(drv->driver.of_match_table, dev);
if (match) if (match)
error = drv->probe(macio_dev, match); error = drv->probe(macio_dev, match);
if (error) if (error)
......
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
#include <asm/errno.h> #include <asm/errno.h>
/** /**
* of_match_device - Tell if an of_device structure has a matching * of_match_device - Tell if a struct device matches an of_device_id list
* of_match structure
* @ids: array of of device match structures to search in * @ids: array of of device match structures to search in
* @dev: the of device structure to match against * @dev: the of device structure to match against
* *
...@@ -19,11 +18,11 @@ ...@@ -19,11 +18,11 @@
* system is in its list of supported devices. * system is in its list of supported devices.
*/ */
const struct of_device_id *of_match_device(const struct of_device_id *matches, const struct of_device_id *of_match_device(const struct of_device_id *matches,
const struct of_device *dev) const struct device *dev)
{ {
if (!dev->dev.of_node) if (!dev->of_node)
return NULL; return NULL;
return of_match_node(matches, dev->dev.of_node); return of_match_node(matches, dev->of_node);
} }
EXPORT_SYMBOL(of_match_device); EXPORT_SYMBOL(of_match_device);
......
...@@ -21,13 +21,12 @@ extern struct device_attribute of_platform_device_attrs[]; ...@@ -21,13 +21,12 @@ extern struct device_attribute of_platform_device_attrs[];
static int of_platform_bus_match(struct device *dev, struct device_driver *drv) static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
{ {
struct of_device *of_dev = to_of_device(dev);
const struct of_device_id *matches = drv->of_match_table; const struct of_device_id *matches = drv->of_match_table;
if (!matches) if (!matches)
return 0; return 0;
return of_match_device(matches, of_dev) != NULL; return of_match_device(matches, dev) != NULL;
} }
static int of_platform_device_probe(struct device *dev) static int of_platform_device_probe(struct device *dev)
...@@ -45,7 +44,7 @@ static int of_platform_device_probe(struct device *dev) ...@@ -45,7 +44,7 @@ static int of_platform_device_probe(struct device *dev)
of_dev_get(of_dev); of_dev_get(of_dev);
match = of_match_device(drv->driver.of_match_table, of_dev); match = of_match_device(drv->driver.of_match_table, dev);
if (match) if (match)
error = drv->probe(of_dev, match); error = drv->probe(of_dev, match);
if (error) if (error)
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define to_of_device(d) container_of(d, struct of_device, dev) #define to_of_device(d) container_of(d, struct of_device, dev)
extern const struct of_device_id *of_match_device( extern const struct of_device_id *of_match_device(
const struct of_device_id *matches, const struct of_device *dev); const struct of_device_id *matches, const struct device *dev);
extern struct of_device *of_dev_get(struct of_device *dev); extern struct of_device *of_dev_get(struct of_device *dev);
extern void of_dev_put(struct of_device *dev); extern void of_dev_put(struct of_device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment