2 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 21266abfbda6..9b626cfffce1 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -140,19 +140,19 @@ static struct dma_map_ops ibmebus_dma_ops = {
 
 static int ibmebus_match_path(struct device *dev, void *data)
 {
-        struct device_node *dn = to_of_device(dev)->dev.of_node;
+        struct device_node *dn = to_platform_device(dev)->dev.of_node;
         return (dn->full_name &&
                 (strcasecmp((char *)data, dn->full_name) == 0));
 }
 
 static int ibmebus_match_node(struct device *dev, void *data)
 {
-        return to_of_device(dev)->dev.of_node == data;
+        return to_platform_device(dev)->dev.of_node == data;
 }
 
 static int ibmebus_create_device(struct device_node *dn)
 {
-        struct of_device *dev;
+        struct platform_device *dev;
         int ret;
 
         dev = of_device_alloc(dn, NULL, &ibmebus_bus_device);
@@ -298,7 +298,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
 
         if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,
                                    ibmebus_match_path))) {
-                of_device_unregister(to_of_device(dev));
+                of_device_unregister(to_platform_device(dev));
 
                 kfree(path);
                 return count;
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index b093d4b1f09c..84439d1b7cb3 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -54,16 +54,16 @@ const struct of_device_id of_default_bus_ids[] = {
 
 static int of_dev_node_match(struct device *dev, void *data)
 {
-        return to_of_device(dev)->dev.of_node == data;
+        return to_platform_device(dev)->dev.of_node == data;
 }
 
-struct of_device *of_find_device_by_node(struct device_node *np)
+struct platform_device *of_find_device_by_node(struct device_node *np)
 {
         struct device *dev;
 
         dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match);
         if (dev)
-                return to_of_device(dev);
+                return to_platform_device(dev);
         return NULL;
 }
 EXPORT_SYMBOL(of_find_device_by_node);
@@ -76,7 +76,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
  * lacking some bits needed here.
  */
 
-static int __devinit of_pci_phb_probe(struct of_device *dev,
+static int __devinit of_pci_phb_probe(struct platform_device *dev,
                                       const struct of_device_id *match)
 {
         struct pci_controller *phb;