qeth: move OSA portname into deprecated status

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / net / qeth_core_main.c

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 5e20fba37bfff268f23ea2e9ce214f71d7f7ff73..cd39a0219da1f89c86089d5f3b6470a281615365 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1982,14 +1982,6 @@ static void qeth_idx_read_cb(struct qeth_channel *channel,
                goto out;
        }
 
-/**
- *  * temporary fix for microcode bug
- *   * to revert it,replace OR by AND
- *    */
-       if ((!QETH_IDX_NO_PORTNAME_REQUIRED(iob->data)) ||
-            (card->info.type == QETH_CARD_TYPE_OSD))
-               card->info.portname_required = 1;
-
        memcpy(&temp, QETH_IDX_ACT_FUNC_LEVEL(iob->data), 2);
        if (temp != qeth_peer_func_level(card->info.func_level)) {
                QETH_DBF_MESSAGE(2, "%s IDX_ACTIVATE on read channel: function "
@@ -2360,8 +2352,6 @@ static int qeth_ulp_enable(struct qeth_card *card)
               &card->token.cm_connection_r, QETH_MPC_TOKEN_LENGTH);
        memcpy(QETH_ULP_ENABLE_FILTER_TOKEN(iob->data),
               &card->token.ulp_filter_w, QETH_MPC_TOKEN_LENGTH);
-       memcpy(QETH_ULP_ENABLE_PORTNAME_AND_LL(iob->data),
-              card->info.portname, 9);
        rc = qeth_send_control_data(card, ULP_ENABLE_SIZE, iob,
                                    qeth_ulp_enable_cb, NULL);
        return rc;
@@ -2680,48 +2670,6 @@ out_qdio:
        return rc;
 }
 
-static void qeth_print_status_with_portname(struct qeth_card *card)
-{
-       char dbf_text[15];
-       int i;
-
-       sprintf(dbf_text, "%s", card->info.portname + 1);
-       for (i = 0; i < 8; i++)
-               dbf_text[i] =
-                       (char) _ebcasc[(__u8) dbf_text[i]];
-       dbf_text[8] = 0;
-       dev_info(&card->gdev->dev, "Device is a%s card%s%s%s\n"
-              "with link type %s (portname: %s)\n",
-              qeth_get_cardname(card),
-              (card->info.mcl_level[0]) ? " (level: " : "",
-              (card->info.mcl_level[0]) ? card->info.mcl_level : "",
-              (card->info.mcl_level[0]) ? ")" : "",
-              qeth_get_cardname_short(card),
-              dbf_text);
-
-}
-
-static void qeth_print_status_no_portname(struct qeth_card *card)
-{
-       if (card->info.portname[0])
-               dev_info(&card->gdev->dev, "Device is a%s "
-                      "card%s%s%s\nwith link type %s "
-                      "(no portname needed by interface).\n",
-                      qeth_get_cardname(card),
-                      (card->info.mcl_level[0]) ? " (level: " : "",
-                      (card->info.mcl_level[0]) ? card->info.mcl_level : "",
-                      (card->info.mcl_level[0]) ? ")" : "",
-                      qeth_get_cardname_short(card));
-       else
-               dev_info(&card->gdev->dev, "Device is a%s "
-                      "card%s%s%s\nwith link type %s.\n",
-                      qeth_get_cardname(card),
-                      (card->info.mcl_level[0]) ? " (level: " : "",
-                      (card->info.mcl_level[0]) ? card->info.mcl_level : "",
-                      (card->info.mcl_level[0]) ? ")" : "",
-                      qeth_get_cardname_short(card));
-}
-
 void qeth_print_status_message(struct qeth_card *card)
 {
        switch (card->info.type) {
@@ -2758,10 +2706,13 @@ void qeth_print_status_message(struct qeth_card *card)
        default:
                memset(&card->info.mcl_level[0], 0, QETH_MCL_LENGTH + 1);
        }
-       if (card->info.portname_required)
-               qeth_print_status_with_portname(card);
-       else
-               qeth_print_status_no_portname(card);
+       dev_info(&card->gdev->dev,
+                "Device is a%s card%s%s%s\nwith link type %s.\n",
+                qeth_get_cardname(card),
+                (card->info.mcl_level[0]) ? " (level: " : "",
+                (card->info.mcl_level[0]) ? card->info.mcl_level : "",
+                (card->info.mcl_level[0]) ? ")" : "",
+                qeth_get_cardname_short(card));
 }
 EXPORT_SYMBOL_GPL(qeth_print_status_message);