diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 16:13:22 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 00:10:41 -0600 |
| commit | 44504b2bebf8b5823c59484e73096a7d6574471d (patch) | |
| tree | c4d901f026b499f6f0f5c64f4ecbdee297f5db1e /drivers/macintosh | |
| parent | 4018294b53d1dae026880e45f174c1cc63b5d435 (diff) | |
| download | linux-stable-44504b2bebf8b5823c59484e73096a7d6574471d.tar.gz linux-stable-44504b2bebf8b5823c59484e73096a7d6574471d.tar.bz2 linux-stable-44504b2bebf8b5823c59484e73096a7d6574471d.zip | |
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: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/macio_asic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index e3ba1d8001a3..97147804a49c 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c @@ -39,13 +39,12 @@ static struct macio_chip *macio_on_hold; 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; if (!matches) 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) @@ -83,7 +82,7 @@ static int macio_device_probe(struct device *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) error = drv->probe(macio_dev, match); if (error) |