1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 63b3ec48c203..343ad29e211c 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
 #include <asm/dcr.h>
 #endif
 
-#if !defined(CONFIG_SPARC)
+#ifdef CONFIG_OF_ADDRESS
 /*
  * The following routines scan a subtree and registers a device for
  * each applicable node.
@@ -253,7 +253,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
         if (!of_device_is_available(node))
                 return NULL;
 
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        dev = amba_device_alloc(NULL, 0, 0);
         if (!dev)
                 return NULL;
 
@@ -283,14 +283,14 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
         if (ret)
                 goto err_free;
 
-        ret = amba_device_register(dev, &iomem_resource);
+        ret = amba_device_add(dev, &iomem_resource);
         if (ret)
                 goto err_free;
 
         return dev;
 
 err_free:
-        kfree(dev);
+        amba_device_put(dev);
         return NULL;
 }
 #else /* CONFIG_ARM_AMBA */
@@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root,
         of_node_put(root);
         return rc;
 }
-#endif /* !CONFIG_SPARC */
+#endif /* CONFIG_OF_ADDRESS */