8 files changed, 12 insertions, 36 deletions

diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 48e8fee9f2d4..9dcf76a10bb6 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -839,10 +839,7 @@ static struct vio_driver vdc_port_driver = {
         .id_table       = vdc_port_match,
         .probe          = vdc_port_probe,
         .remove         = vdc_port_remove,
-        .driver         = {
-                .name   = "vdc_port",
-                .owner  = THIS_MODULE,
-        }
+        .name           = "vdc_port",
 };
 
 static int __init vdc_init(void)
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index e877371680a9..9010cea68bc3 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1616,11 +1616,8 @@ static struct vio_driver ibmveth_driver = {
         .probe          = ibmveth_probe,
         .remove         = ibmveth_remove,
         .get_desired_dma = ibmveth_get_desired_dma,
-        .driver         = {
-                .name   = ibmveth_driver_name,
-                .owner  = THIS_MODULE,
-                .pm = &ibmveth_pm_ops,
-        }
+        .name           = ibmveth_driver_name,
+        .pm             = &ibmveth_pm_ops,
 };
 
 static int __init ibmveth_module_init(void)
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 92a037a8228a..38e3ae9155b7 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1259,10 +1259,7 @@ static struct vio_driver vnet_port_driver = {
         .id_table       = vnet_port_match,
         .probe          = vnet_port_probe,
         .remove         = vnet_port_remove,
-        .driver         = {
-                .name   = "vnet_port",
-                .owner  = THIS_MODULE,
-        }
+        .name           = "vnet_port",
 };
 
 static int __init vnet_init(void)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index bdfa223a7dbb..134a0ae85bb7 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -4890,11 +4890,8 @@ static struct vio_driver ibmvfc_driver = {
         .probe = ibmvfc_probe,
         .remove = ibmvfc_remove,
         .get_desired_dma = ibmvfc_get_desired_dma,
-        .driver = {
-                .name = IBMVFC_NAME,
-                .owner = THIS_MODULE,
-                .pm = &ibmvfc_pm_ops,
-        }
+        .name = IBMVFC_NAME,
+        .pm = &ibmvfc_pm_ops,
 };
 
 static struct fc_function_template ibmvfc_transport_functions = {
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index e984951baeb6..3a6c4742951e 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -2061,11 +2061,8 @@ static struct vio_driver ibmvscsi_driver = {
         .probe = ibmvscsi_probe,
         .remove = ibmvscsi_remove,
         .get_desired_dma = ibmvscsi_get_desired_dma,
-        .driver = {
-                .name = "ibmvscsi",
-                .owner = THIS_MODULE,
-                .pm = &ibmvscsi_pm_ops,
-        }
+        .name = "ibmvscsi",
+        .pm = &ibmvscsi_pm_ops,
 };
 
 static struct srp_function_template ibmvscsi_transport_functions = {
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 2256babe0474..aa7ed81e9237 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -918,10 +918,7 @@ static struct vio_driver ibmvstgt_driver = {
         .id_table = ibmvstgt_device_table,
         .probe = ibmvstgt_probe,
         .remove = ibmvstgt_remove,
-        .driver = {
-                .name = "ibmvscsis",
-                .owner = THIS_MODULE,
-        }
+        .name = "ibmvscsis",
 };
 
 static int get_system_info(void)
diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 3a0d53d6368f..ee307799271a 100644
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -310,11 +310,8 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 static struct vio_driver hvc_vio_driver = {
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
-        .remove         = __devexit_p(hvc_vio_remove),
-        .driver         = {
-                .name   = hvc_driver_name,
-                .owner  = THIS_MODULE,
-        }
+        .remove         = hvc_vio_remove,
+        .name           = hvc_driver_name,
 };
 
 static int __init hvc_vio_init(void)
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index d23759183b47..3436436fe2d7 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -879,10 +879,7 @@ static struct vio_driver hvcs_vio_driver = {
         .id_table       = hvcs_driver_table,
         .probe          = hvcs_probe,
         .remove         = __devexit_p(hvcs_remove),
-        .driver         = {
-                .name   = hvcs_driver_name,
-                .owner  = THIS_MODULE,
-        }
+        .name           = hvcs_driver_name,
 };
 
 /* Only called from hvcs_get_pi please */