s390/qeth: stop using struct ccwgroup driver for discipline callbacks

The interface between qeth and its disciplines should not depend on
struct ccwgroup_driver, as a qeth discipline is not a ccwgroup
driver on its own. Instead provide the particular callbacks in struct
qeth_discipline.

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>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 0e7c29d1d7ef..426986518e96 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -882,12 +882,6 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
         INIT_LIST_HEAD(&card->mc_list);
         card->options.layer2 = 1;
         card->info.hwtrap = 0;
-        card->discipline.start_poll = qeth_qdio_start_poll;
-        card->discipline.input_handler = (qdio_handler_t *)
-                qeth_qdio_input_handler;
-        card->discipline.output_handler = (qdio_handler_t *)
-                qeth_qdio_output_handler;
-        card->discipline.recover = qeth_l2_recover;
         return 0;
 }
 
@@ -1227,8 +1221,12 @@ out:
         return rc;
 }
 
-struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
-        .probe = qeth_l2_probe_device,
+struct qeth_discipline qeth_l2_discipline = {
+        .start_poll = qeth_qdio_start_poll,
+        .input_handler = (qdio_handler_t *) qeth_qdio_input_handler,
+        .output_handler = (qdio_handler_t *) qeth_qdio_output_handler,
+        .recover = qeth_l2_recover,
+        .setup = qeth_l2_probe_device,
         .remove = qeth_l2_remove_device,
         .set_online = qeth_l2_set_online,
         .set_offline = qeth_l2_set_offline,
@@ -1237,7 +1235,7 @@ struct ccwgroup_driver qeth_l2_ccwgroup_driver = {
         .thaw = qeth_l2_pm_resume,
         .restore = qeth_l2_pm_resume,
 };
-EXPORT_SYMBOL_GPL(qeth_l2_ccwgroup_driver);
+EXPORT_SYMBOL_GPL(qeth_l2_discipline);
 
 static int qeth_osn_send_control_data(struct qeth_card *card, int len,
                            struct qeth_cmd_buffer *iob)