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>

2 files changed, 10 insertions, 6 deletions

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index a2c4dd4fb221..fcf6f2c76300 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1150,10 +1150,12 @@ static struct vio_device_id ibmveth_device_table[] __devinitdata= {
 MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
 
 static struct vio_driver ibmveth_driver = {
-        .name        = (char *)ibmveth_driver_name,
-        .id_table    = ibmveth_device_table,
-        .probe       = ibmveth_probe,
-        .remove      = ibmveth_remove
+        .id_table       = ibmveth_device_table,
+        .probe          = ibmveth_probe,
+        .remove         = ibmveth_remove,
+        .driver         = {
+                .name   = ibmveth_driver_name,
+        }
 };
 
 static int __init ibmveth_module_init(void)
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index db3bc2f6f0fa..33613fe9556c 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -1648,10 +1648,12 @@ static struct vio_device_id veth_device_table[] __devinitdata = {
 MODULE_DEVICE_TABLE(vio, veth_device_table);
 
 static struct vio_driver veth_driver = {
-        .name = DRV_NAME,
         .id_table = veth_device_table,
         .probe = veth_probe,
-        .remove = veth_remove
+        .remove = veth_remove,
+        .driver = {
+                .name = DRV_NAME,
+        }
 };
 
 /*