drivercore: Add of_match_table to the common device drivers

[pandora-kernel.git] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d58ade1..9fd7f7d 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -22,8 +22,7 @@ extern struct device_attribute of_platform_device_attrs[];
 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
        struct of_device *of_dev = to_of_device(dev);
-       struct of_platform_driver *of_drv = to_of_platform_driver(drv);
-       const struct of_device_id *matches = of_drv->match_table;
+       const struct of_device_id *matches = drv->of_match_table;
 
        if (!matches)
                return 0;
@@ -46,7 +45,7 @@ static int of_platform_device_probe(struct device *dev)
 
        of_dev_get(of_dev);
 
-       match = of_match_device(drv->match_table, of_dev);
+       match = of_match_device(drv->driver.of_match_table, of_dev);
        if (match)
                error = drv->probe(of_dev, match);
        if (error)
@@ -391,6 +390,8 @@ int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
                drv->driver.name = drv->name;
        if (!drv->driver.owner)
                drv->driver.owner = drv->owner;
+       if (!drv->driver.of_match_table)
+               drv->driver.of_match_table = drv->match_table;
        drv->driver.bus = bus;
 
        /* register with core */