powerpc: don't duplicate name between vio_driver and device_driver

Just set the name field directly in the device_driver structure
contained in the vio_driver struct.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

3 files changed, 8 insertions, 4 deletions

diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index 78d681dc35a8..f5212eb2b41d 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -95,11 +95,11 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 }
 
 static struct vio_driver hvc_vio_driver = {
-        .name           = hvc_driver_name,
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
         .remove         = hvc_vio_remove,
         .driver         = {
+                .name   = hvc_driver_name,
                 .owner  = THIS_MODULE,
         }
 };
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index f47f009f9259..8486298c011f 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -720,10 +720,12 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 };
 
 static struct vio_driver hvcs_vio_driver = {
-        .name           = hvcs_driver_name,
         .id_table       = hvcs_driver_table,
         .probe          = hvcs_probe,
         .remove         = hvcs_remove,
+        .driver         = {
+                .name   = hvcs_driver_name,
+        }
 };
 
 /* Only called from hvcs_get_pi please */
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 0aff45fac2e6..8fc1115c4b69 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -996,10 +996,12 @@ static struct vio_device_id viotape_device_table[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(vio, viotape_device_table);
 static struct vio_driver viotape_driver = {
-        .name = "viotape",
         .id_table = viotape_device_table,
         .probe = viotape_probe,
-        .remove = viotape_remove
+        .remove = viotape_remove,
+        .driver = {
+                .name = "viotape",
+        }
 };