s390/qeth: use a static Output Queue array

qeth dynamically allocates an array for storing pointers to its
Output Queue structures. Switch this to a static array - we are
currently limited to 4 Output Queues, so shrinking the qeth_qdio_info
struct by just a few bytes doesn't justify the additional complexity.

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 18696ffb662d2b5e127b852a77b77b0b13be8f0e..2ea5d7c0b94c82d2127914216294c4fa2a1a46d4 100644 (file)
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -528,7 +528,7 @@ struct qeth_qdio_info {
 
        /* output */
        int no_out_queues;
-       struct qeth_qdio_out_q **out_qs;
+       struct qeth_qdio_out_q *out_qs[QETH_MAX_QUEUES];
        struct qdio_outbuf_state *out_bufstates;
 
        /* priority queueing */

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 5ca934775c425a5228e5500e656b3d51bf08f96f..d01a4aded4cc3bf2753dcbe0493ced116a346390 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -2433,12 +2433,6 @@ static int qeth_alloc_qdio_buffers(struct qeth_card *card)
                goto out_freeinq;
 
        /* outbound */
-       card->qdio.out_qs =
-               kcalloc(card->qdio.no_out_queues,
-                       sizeof(struct qeth_qdio_out_q *),
-                       GFP_KERNEL);
-       if (!card->qdio.out_qs)
-               goto out_freepool;
        for (i = 0; i < card->qdio.no_out_queues; ++i) {
                card->qdio.out_qs[i] = qeth_alloc_qdio_out_buf();
                if (!card->qdio.out_qs[i])
@@ -2468,11 +2462,10 @@ out_freeoutqbufs:
                card->qdio.out_qs[i]->bufs[j] = NULL;
        }
 out_freeoutq:
-       while (i > 0)
+       while (i > 0) {
                qeth_free_output_queue(card->qdio.out_qs[--i]);
-       kfree(card->qdio.out_qs);
-       card->qdio.out_qs = NULL;
-out_freepool:
+               card->qdio.out_qs[i] = NULL;
+       }
        qeth_free_buffer_pool(card);
 out_freeinq:
        qeth_free_qdio_queue(card->qdio.in_q);
@@ -2501,11 +2494,9 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
        /* inbound buffer pool */
        qeth_free_buffer_pool(card);
        /* free outbound qdio_qs */
-       if (card->qdio.out_qs) {
-               for (i = 0; i < card->qdio.no_out_queues; i++)
-                       qeth_free_output_queue(card->qdio.out_qs[i]);
-               kfree(card->qdio.out_qs);
-               card->qdio.out_qs = NULL;
+       for (i = 0; i < card->qdio.no_out_queues; i++) {
+               qeth_free_output_queue(card->qdio.out_qs[i]);
+               card->qdio.out_qs[i] = NULL;
        }
 }