[POWERPC] Move of_platform_driver initialisations: arch/powerpc

We no longer initialise the name and owner fields of the
of_platform_driver, but use the fields of the embedded device_driver's
name field instead.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 9 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index ab037a3a40..4d3ba63bba 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -324,11 +324,13 @@ static struct of_device_id axon_ram_device_id[] = {
 };
 
 static struct of_platform_driver axon_ram_driver = {
-        .owner          = THIS_MODULE,
-        .name           = AXON_RAM_MODULE_NAME,
         .match_table    = axon_ram_device_id,
         .probe          = axon_ram_probe,
-        .remove         = axon_ram_remove
+        .remove         = axon_ram_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = AXON_RAM_MODULE_NAME,
+        },
 };
 
 /**
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c
index 2f91b55b77..20edd1e94e 100644
--- a/arch/powerpc/sysdev/pmi.c
+++ b/arch/powerpc/sysdev/pmi.c
@@ -205,10 +205,12 @@ static int pmi_of_remove(struct of_device *dev)
 }
 
 static struct of_platform_driver pmi_of_platform_driver = {
-        .name           = "pmi",
         .match_table    = pmi_match,
         .probe          = pmi_of_probe,
-        .remove         = pmi_of_remove
+        .remove         = pmi_of_remove,
+        .driver         = {
+                .name   = "pmi",
+        },
 };
 
 static int __init pmi_module_init(void)