diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/macintosh/macio_asic.c | 5 | ||||
-rw-r--r-- | drivers/of/platform.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 48a5f0406865..e3ba1d8001a3 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c | |||
@@ -40,8 +40,7 @@ static struct macio_chip *macio_on_hold; | |||
40 | static int macio_bus_match(struct device *dev, struct device_driver *drv) | 40 | static int macio_bus_match(struct device *dev, struct device_driver *drv) |
41 | { | 41 | { |
42 | struct macio_dev * macio_dev = to_macio_device(dev); | 42 | struct macio_dev * macio_dev = to_macio_device(dev); |
43 | struct macio_driver * macio_drv = to_macio_driver(drv); | 43 | const struct of_device_id * matches = drv->of_match_table; |
44 | const struct of_device_id * matches = macio_drv->match_table; | ||
45 | 44 | ||
46 | if (!matches) | 45 | if (!matches) |
47 | return 0; | 46 | return 0; |
@@ -84,7 +83,7 @@ static int macio_device_probe(struct device *dev) | |||
84 | 83 | ||
85 | macio_dev_get(macio_dev); | 84 | macio_dev_get(macio_dev); |
86 | 85 | ||
87 | match = of_match_device(drv->match_table, &macio_dev->ofdev); | 86 | match = of_match_device(drv->driver.of_match_table, &macio_dev->ofdev); |
88 | if (match) | 87 | if (match) |
89 | error = drv->probe(macio_dev, match); | 88 | error = drv->probe(macio_dev, match); |
90 | if (error) | 89 | if (error) |
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index d58ade170c4b..9fd7f7d0a0d1 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[]; | |||
22 | static int of_platform_bus_match(struct device *dev, struct device_driver *drv) | 22 | static int of_platform_bus_match(struct device *dev, struct device_driver *drv) |
23 | { | 23 | { |
24 | struct of_device *of_dev = to_of_device(dev); | 24 | struct of_device *of_dev = to_of_device(dev); |
25 | struct of_platform_driver *of_drv = to_of_platform_driver(drv); | 25 | const struct of_device_id *matches = drv->of_match_table; |
26 | const struct of_device_id *matches = of_drv->match_table; | ||
27 | 26 | ||
28 | if (!matches) | 27 | if (!matches) |
29 | return 0; | 28 | return 0; |
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev) | |||
46 | 45 | ||
47 | of_dev_get(of_dev); | 46 | of_dev_get(of_dev); |
48 | 47 | ||
49 | match = of_match_device(drv->match_table, of_dev); | 48 | match = of_match_device(drv->driver.of_match_table, of_dev); |
50 | if (match) | 49 | if (match) |
51 | error = drv->probe(of_dev, match); | 50 | error = drv->probe(of_dev, match); |
52 | if (error) | 51 | if (error) |
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) | |||
391 | drv->driver.name = drv->name; | 390 | drv->driver.name = drv->name; |
392 | if (!drv->driver.owner) | 391 | if (!drv->driver.owner) |
393 | drv->driver.owner = drv->owner; | 392 | drv->driver.owner = drv->owner; |
393 | if (!drv->driver.of_match_table) | ||
394 | drv->driver.of_match_table = drv->match_table; | ||
394 | drv->driver.bus = bus; | 395 | drv->driver.bus = bus; |
395 | 396 | ||
396 | /* register with core */ | 397 | /* register with core */ |