Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Julian Wiedmann and committed by
Heiko Carstens
0a86cdcb 718ce9e1

+2 -2
+2 -2
drivers/s390/cio/qdio_main.c
··· 669 669 goto no_handler; 670 670 } 671 671 672 - q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE, 673 - q->nr, q->first_to_check, 0, irq_ptr->int_parm); 672 + q->handler(irq_ptr->cdev, QDIO_ERROR_ACTIVATE, 0, q->first_to_check, 673 + 0, irq_ptr->int_parm); 674 674 no_handler: 675 675 qdio_set_state(irq_ptr, QDIO_IRQ_STATE_STOPPED); 676 676 /*