Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree updates from Grant Likely:
 "This branch contains the following changes:
   - Removal of CONFIG_OF_DEVICE, it is always enabled by CONFIG_OF
   - Remove #ifdef from linux/of_platform.h to increase compiler syntax
     coverage
   - Bug fix for address decoding on Bimini and js2x powerpc platforms.
   - miscellaneous binding changes

  One note on the above.  The binding changes going in from all kinds of
  different trees has gotten rather out of hand.  I picked up some
  during this cycle, but even going though my tree isn't a great fit.

  Ian Campbell has prototyped splitting the bindings and .dtb files into
  a separate repository.  The plan is to migrate to using that sometime
  in the next few kernel releases which should get rid of a lot of the
  churn on binding docs and .dts files"

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  of: Fix address decoding on Bimini and js2x machines
  of: remove CONFIG_OF_DEVICE
  usb: chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE
  of: remove of_platform_driver
  ibmebus: convert of_platform_driver to platform_driver
  driver core: move to_platform_driver to platform_device.h
  mfd: DT bindings for the palmas family MFD
  ARM: dts: omap3-devkit8000: fix NAND memory binding
  of/base: fix typos
  of: remove #ifdef from linux/of_platform.h

1 files changed, 10 insertions, 12 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 8220baa46faf..16a7c2326d48 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -205,7 +205,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
         return ret;
 }
 
-int ibmebus_register_driver(struct of_platform_driver *drv)
+int ibmebus_register_driver(struct platform_driver *drv)
 {
         /* If the driver uses devices that ibmebus doesn't know, add them */
         ibmebus_create_devices(drv->driver.of_match_table);
@@ -215,7 +215,7 @@ int ibmebus_register_driver(struct of_platform_driver *drv)
 }
 EXPORT_SYMBOL(ibmebus_register_driver);
 
-void ibmebus_unregister_driver(struct of_platform_driver *drv)
+void ibmebus_unregister_driver(struct platform_driver *drv)
 {
         driver_unregister(&drv->driver);
 }
@@ -338,11 +338,10 @@ static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)
 static int ibmebus_bus_device_probe(struct device *dev)
 {
         int error = -ENODEV;
-        struct of_platform_driver *drv;
+        struct platform_driver *drv;
         struct platform_device *of_dev;
-        const struct of_device_id *match;
 
-        drv = to_of_platform_driver(dev->driver);
+        drv = to_platform_driver(dev->driver);
         of_dev = to_platform_device(dev);
 
         if (!drv->probe)
@@ -350,9 +349,8 @@ static int ibmebus_bus_device_probe(struct device *dev)
 
         of_dev_get(of_dev);
 
-        match = of_match_device(drv->driver.of_match_table, dev);
-        if (match)
-                error = drv->probe(of_dev, match);
+        if (of_driver_match_device(dev, dev->driver))
+                error = drv->probe(of_dev);
         if (error)
                 of_dev_put(of_dev);
 
@@ -362,7 +360,7 @@ static int ibmebus_bus_device_probe(struct device *dev)
 static int ibmebus_bus_device_remove(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
 
         if (dev->driver && drv->remove)
                 drv->remove(of_dev);
@@ -372,7 +370,7 @@ static int ibmebus_bus_device_remove(struct device *dev)
 static void ibmebus_bus_device_shutdown(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
 
         if (dev->driver && drv->shutdown)
                 drv->shutdown(of_dev);
@@ -419,7 +417,7 @@ struct device_attribute ibmebus_bus_device_attrs[] = {
 static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
         int ret = 0;
 
         if (dev->driver && drv->suspend)
@@ -430,7 +428,7 @@ static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
 static int ibmebus_bus_legacy_resume(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
         int ret = 0;
 
         if (dev->driver && drv->resume)