s390/ccwgroup: remove ccwgroup_create_from_string

Remove the old ccwgroup_create_from_string interface since all
drivers have been converted to ccwgroup_create_dev. Also remove
now unused members of ccwgroup_driver.

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

4 files changed, 6 insertions, 17 deletions

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index f7e7dcd74817..634c7e8e631d 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -262,12 +262,10 @@ static struct ccwgroup_driver claw_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "claw",
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xC3D3C1E6,
         .setup       = claw_probe,
-        .remove      = claw_remove_device,
-        .set_online  = claw_new_device,
-        .set_offline = claw_shutdown_device,
+        .remove      = claw_remove_device,
+        .set_online  = claw_new_device,
+        .set_offline = claw_shutdown_device,
         .prepare     = claw_pm_prepare,
 };
 
@@ -292,8 +290,7 @@ static ssize_t claw_driver_group_store(struct device_driver *ddrv,
                                        const char *buf, size_t count)
 {
         int err;
-        err = ccwgroup_create_dev(claw_root_dev, claw_group_driver.driver_id,
-                                  &claw_group_driver, 2, buf);
+        err = ccwgroup_create_dev(claw_root_dev, &claw_group_driver, 2, buf);
         return err ? err : count;
 }
 static DRIVER_ATTR(group, 0200, NULL, claw_driver_group_store);
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index abb84c3849e0..84777e369a29 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1767,8 +1767,6 @@ static struct ccwgroup_driver ctcm_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = CTC_DRIVER_NAME,
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xC3E3C3D4,      /* CTCM */
         .setup       = ctcm_probe_device,
         .remove      = ctcm_remove_device,
         .set_online  = ctcm_new_device,
@@ -1783,8 +1781,7 @@ static ssize_t ctcm_driver_group_store(struct device_driver *ddrv,
 {
         int err;
 
-        err = ccwgroup_create_dev(ctcm_root_dev, ctcm_group_driver.driver_id,
-                                  &ctcm_group_driver, 2, buf);
+        err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf);
         return err ? err : count;
 }
 static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store);
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 0abba9364214..f1dfc8d72d7a 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -2412,8 +2412,6 @@ static struct ccwgroup_driver lcs_group_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "lcs",
         },
-        .max_slaves  = 2,
-        .driver_id   = 0xD3C3E2,
         .setup       = lcs_probe_device,
         .remove      = lcs_remove_device,
         .set_online  = lcs_new_device,
@@ -2429,8 +2427,7 @@ static ssize_t lcs_driver_group_store(struct device_driver *ddrv,
                                       const char *buf, size_t count)
 {
         int err;
-        err = ccwgroup_create_dev(lcs_root_dev, lcs_group_driver.driver_id,
-                                  &lcs_group_driver, 2, buf);
+        err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf);
         return err ? err : count;
 }
 static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 9423f3d7e20f..d1c87420edf3 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -5267,7 +5267,6 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
                 .owner = THIS_MODULE,
                 .name = "qeth",
         },
-        .driver_id = 0xD8C5E3C8,
         .setup = qeth_core_probe_device,
         .remove = qeth_core_remove_device,
         .set_online = qeth_core_set_online,
@@ -5286,7 +5285,6 @@ static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv,
         int err;
 
         err = ccwgroup_create_dev(qeth_core_root_dev,
-                                  qeth_core_ccwgroup_driver.driver_id,
                                   &qeth_core_ccwgroup_driver, 3, buf);
 
         return err ? err : count;