s390/qdio: clean up access to queue in qdio_handle_activate_check()

qdio_handle_activate_check() re-uses a queue-specific handler to report
that the ACTIVATE ccw has been terminated. It uses either the first
input or output queue, so we can hard-code q->nr as 0. Also don't
access the q->irq_ptr parent pointer, we already have a pointer to
the qdio_irq.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 9b48573db93dad63f2ea527c70597bdf1e2b14d0..3e586e460f919b8416c44429a8779a47308a55b7 100644 (file)
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -669,8 +669,8 @@ static void qdio_handle_activate_check(struct qdio_irq *irq_ptr,
                goto no_handler;
        }
 
-       q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE,
-                  q->nr, q->first_to_check, 0, irq_ptr->int_parm);
+       q->handler(irq_ptr->cdev, QDIO_ERROR_ACTIVATE, 0, q->first_to_check,
+                  0, irq_ptr->int_parm);
 no_handler:
        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_STOPPED);
        /*