s390/qeth: remove QETH_QDIO_BUF_HANDLED_DELAYED state

[ Upstream commit 75cf3854dcdf7b5c583538cae12ffa054d237d93 ]

Reuse the QETH_QDIO_BUF_EMPTY state to indicate that a TX buffer has
been completed with a QAOB notification, and may be cleaned up by
qeth_cleanup_handled_pending().

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Julian Wiedmann 2020-12-07 14:12:32 +01:00 committed by Greg Kroah-Hartman
parent 926200fd22
commit 144dbdf86c
2 changed files with 2 additions and 5 deletions

View File

@ -424,8 +424,6 @@ enum qeth_qdio_out_buffer_state {
/* Received QAOB notification on CQ: */ /* Received QAOB notification on CQ: */
QETH_QDIO_BUF_QAOB_OK, QETH_QDIO_BUF_QAOB_OK,
QETH_QDIO_BUF_QAOB_ERROR, QETH_QDIO_BUF_QAOB_ERROR,
/* Handled via transfer pending / completion queue. */
QETH_QDIO_BUF_HANDLED_DELAYED,
}; };
struct qeth_qdio_out_buffer { struct qeth_qdio_out_buffer {

View File

@ -477,8 +477,7 @@ static void qeth_cleanup_handled_pending(struct qeth_qdio_out_q *q, int bidx,
while (c) { while (c) {
if (forced_cleanup || if (forced_cleanup ||
atomic_read(&c->state) == atomic_read(&c->state) == QETH_QDIO_BUF_EMPTY) {
QETH_QDIO_BUF_HANDLED_DELAYED) {
struct qeth_qdio_out_buffer *f = c; struct qeth_qdio_out_buffer *f = c;
QETH_CARD_TEXT(f->q->card, 5, "fp"); QETH_CARD_TEXT(f->q->card, 5, "fp");
@ -549,7 +548,7 @@ static void qeth_qdio_handle_aob(struct qeth_card *card,
kmem_cache_free(qeth_core_header_cache, data); kmem_cache_free(qeth_core_header_cache, data);
} }
atomic_set(&buffer->state, QETH_QDIO_BUF_HANDLED_DELAYED); atomic_set(&buffer->state, QETH_QDIO_BUF_EMPTY);
break; break;
default: default:
WARN_ON_ONCE(1); WARN_ON_ONCE(1);