[S390] ccwgroup_driver: remove duplicate members

Remove the owner and name members of struct
ccwgroup_driver and convert all drivers to store
this data in the embedded struct device_driver.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

5 files changed, 18 insertions, 12 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 2864581d8ecb..5c567414c4bb 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -428,7 +428,7 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const
         gdev = to_ccwgroupdev(dev);
         gdrv = to_ccwgroupdrv(dev->driver);
 
-        if (!try_module_get(gdrv->owner))
+        if (!try_module_get(gdrv->driver.owner))
                 return -EINVAL;
 
         ret = strict_strtoul(buf, 0, &value);
@@ -442,7 +442,7 @@ ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const
         else
                 ret = -EINVAL;
 out:
-        module_put(gdrv->owner);
+        module_put(gdrv->driver.owner);
         return (ret == 0) ? count : ret;
 }
 
@@ -616,8 +616,6 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver)
 {
         /* register our new driver with the core */
         cdriver->driver.bus = &ccwgroup_bus_type;
-        cdriver->driver.name = cdriver->name;
-        cdriver->driver.owner = cdriver->owner;
 
         return driver_register(&cdriver->driver);
 }
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 2e2d2dfe78db..9feb62febb3d 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -264,8 +264,10 @@ static struct device *claw_root_dev;
 /* ccwgroup table  */
 
 static struct ccwgroup_driver claw_group_driver = {
-        .owner       = THIS_MODULE,
-        .name        = "claw",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "claw",
+        },
         .max_slaves  = 2,
         .driver_id   = 0xC3D3C1E6,
         .probe       = claw_probe,
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 97fd4800ab12..c189296763a4 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1774,8 +1774,10 @@ static struct ccw_driver ctcm_ccw_driver = {
 };
 
 static struct ccwgroup_driver ctcm_group_driver = {
-        .owner       = THIS_MODULE,
-        .name        = CTC_DRIVER_NAME,
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = CTC_DRIVER_NAME,
+        },
         .max_slaves  = 2,
         .driver_id   = 0xC3E3C3D4,      /* CTCM */
         .probe       = ctcm_probe_device,
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index f59429c3bc30..7fbc4adbb6d5 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -2409,8 +2409,10 @@ static struct ccw_driver lcs_ccw_driver = {
  * LCS ccwgroup driver registration
  */
 static struct ccwgroup_driver lcs_group_driver = {
-        .owner       = THIS_MODULE,
-        .name        = "lcs",
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "lcs",
+        },
         .max_slaves  = 2,
         .driver_id   = 0xD3C3E2,
         .probe       = lcs_probe_device,
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 150b2cd99ba8..10a3a3b4dd3e 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4430,8 +4430,10 @@ static int qeth_core_restore(struct ccwgroup_device *gdev)
 }
 
 static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
-        .owner = THIS_MODULE,
-        .name = "qeth",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "qeth",
+        },
         .driver_id = 0xD8C5E3C8,
         .probe = qeth_core_probe_device,
         .remove = qeth_core_remove_device,