s390/qeth: consolidate QDIO queue setup

Move some duplicated logic into a shared code path.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index 7c37e94fb28be6ceeefbde0c94939d79508484d2..09d8211fd542a98823610451cf16d4ecf8e0c229 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -994,7 +994,6 @@ int qeth_core_hardsetup_card(struct qeth_card *card, bool *carrier_ok);
 int qeth_stop_channel(struct qeth_channel *channel);
 
 void qeth_print_status_message(struct qeth_card *);
-int qeth_init_qdio_queues(struct qeth_card *);
 int qeth_send_ipa_cmd(struct qeth_card *, struct qeth_cmd_buffer *,
                  int (*reply_cb)
                  (struct qeth_card *, struct qeth_reply *, unsigned long),

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c19cc3978e1fe509227158bf695e6db466b70eda..52e5f086444b9daa42e0f15b4c7765a421981e3c 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -2665,7 +2665,7 @@ static unsigned int qeth_tx_select_bulk_max(struct qeth_card *card,
        return card->ssqd.mmwc ? card->ssqd.mmwc : 1;
 }
 
-int qeth_init_qdio_queues(struct qeth_card *card)
+static int qeth_init_qdio_queues(struct qeth_card *card)
 {
        unsigned int i;
        int rc;
@@ -2713,7 +2713,6 @@ int qeth_init_qdio_queues(struct qeth_card *card)
        }
        return 0;
 }
-EXPORT_SYMBOL_GPL(qeth_init_qdio_queues);
 
 static void qeth_ipa_finalize_cmd(struct qeth_card *card,
                                  struct qeth_cmd_buffer *iob)
@@ -5026,6 +5025,12 @@ retriable:
        if (rc)
                goto out;
 
+       rc = qeth_init_qdio_queues(card);
+       if (rc) {
+               QETH_CARD_TEXT_(card, 2, "9err%d", rc);
+               goto out;
+       }
+
        return 0;
 out:
        dev_warn(&card->gdev->dev, "The qeth device driver failed to recover "

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 7da306e267c92d88278330264d5e1320938e9e13..5d9bb059746584ca8d4e3810c0bddc213cc4b0ee 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -288,11 +288,11 @@ static void qeth_l2_stop_card(struct qeth_card *card)
        }
        if (card->state == CARD_STATE_HARDSETUP) {
                qeth_drain_output_queues(card);
-               qeth_clear_working_pool_list(card);
                card->state = CARD_STATE_DOWN;
        }
 
        qeth_qdio_clear_card(card, 0);
+       qeth_clear_working_pool_list(card);
        flush_workqueue(card->event_wq);
        card->info.mac_bits &= ~QETH_LAYER2_MAC_REGISTERED;
        card->info.promisc_mode = 0;
@@ -787,12 +787,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)
        /* softsetup */
        QETH_CARD_TEXT(card, 2, "softsetp");
 
-       rc = qeth_init_qdio_queues(card);
-       if (rc) {
-               QETH_CARD_TEXT_(card, 2, "6err%d", rc);
-               rc = -ENODEV;
-               goto out_remove;
-       }
        card->state = CARD_STATE_SOFTSETUP;
 
        qeth_set_allowed_threads(card, 0xffffffff, 0);

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 6c0bffd11138d280f2b265d5a1747824b95d751e..ee1bdaaa26f6293c946aefc27b2fcfbfc4481ad5 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1184,11 +1184,11 @@ static void qeth_l3_stop_card(struct qeth_card *card)
        }
        if (card->state == CARD_STATE_HARDSETUP) {
                qeth_drain_output_queues(card);
-               qeth_clear_working_pool_list(card);
                card->state = CARD_STATE_DOWN;
        }
 
        qeth_qdio_clear_card(card, 0);
+       qeth_clear_working_pool_list(card);
        flush_workqueue(card->event_wq);
        card->info.promisc_mode = 0;
 }
@@ -2097,12 +2097,6 @@ static int qeth_l3_set_online(struct ccwgroup_device *gdev)
                        QETH_CARD_TEXT_(card, 2, "5err%04x", rc);
        }
 
-       rc = qeth_init_qdio_queues(card);
-       if (rc) {
-               QETH_CARD_TEXT_(card, 2, "6err%d", rc);
-               rc = -ENODEV;
-               goto out_remove;
-       }
        card->state = CARD_STATE_SOFTSETUP;
 
        qeth_set_allowed_threads(card, 0xffffffff, 0);