s390/qeth: fix up ssqd tracing

[karo-tx-linux.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 9a5f99ccb122bab3918f136f403bdec04b98d2f4..510947b1fee49839440085e97059066b3e092f56 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4775,12 +4775,10 @@ static int qeth_query_card_info(struct qeth_card *card,
 
 static inline int qeth_get_qdio_q_format(struct qeth_card *card)
 {
-       switch (card->info.type) {
-       case QETH_CARD_TYPE_IQD:
-               return 2;
-       default:
-               return 0;
-       }
+       if (card->info.type == QETH_CARD_TYPE_IQD)
+               return QDIO_IQDIO_QFMT;
+       else
+               return QDIO_QETH_QFMT;
 }
 
 static void qeth_determine_capabilities(struct qeth_card *card)
@@ -4819,8 +4817,9 @@ static void qeth_determine_capabilities(struct qeth_card *card)
                QETH_DBF_TEXT_(SETUP, 2, "6err%d", rc);
 
        QETH_DBF_TEXT_(SETUP, 2, "qfmt%d", card->ssqd.qfmt);
-       QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac1);
-       QETH_DBF_TEXT_(SETUP, 2, "%d", card->ssqd.qdioac3);
+       QETH_DBF_TEXT_(SETUP, 2, "ac1:%02x", card->ssqd.qdioac1);
+       QETH_DBF_TEXT_(SETUP, 2, "ac2:%04x", card->ssqd.qdioac2);
+       QETH_DBF_TEXT_(SETUP, 2, "ac3:%04x", card->ssqd.qdioac3);
        QETH_DBF_TEXT_(SETUP, 2, "icnt%d", card->ssqd.icnt);
        if (!((card->ssqd.qfmt != QDIO_IQDIO_QFMT) ||
            ((card->ssqd.qdioac1 & CHSC_AC1_INITIATE_INPUTQ) == 0) ||