powerpc+sparc/vio: Modernize driver registration

This makes vio_register_driver() get the module owner & name at compile
time like PCI drivers do, and adds a name pointer directly in struct
vio_driver to avoid having to explicitly initialize the embedded
struct device.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: David S. Miller <davem@davemloft.net>

3 files changed, 5 insertions, 14 deletions

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)