Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5dfcff authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

s390: Cio: Use the core irq stats function 



Let the core do the irq_desc resolution.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: s390 <linux-s390@vger.kernel.org>
Link: http://lkml.kernel.org/r/20140223212737.983433636@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a21748c9

drivers/s390/cio/cio.c

+1 −4
Original line number Diff line number Diff line
@@ -584,8 +584,6 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy) 
	return IRQ_HANDLED;

}



static struct irq_desc *irq_desc_io;



static struct irqaction io_interrupt = {

	.name	 = "IO",

	.handler = do_cio_interrupt,
@@ -596,7 +594,6 @@ void __init init_cio_interrupts(void) 
	irq_set_chip_and_handler(IO_INTERRUPT,

				 &dummy_irq_chip, handle_percpu_irq);

	setup_irq(IO_INTERRUPT, &io_interrupt);

	irq_desc_io = irq_to_desc(IO_INTERRUPT);

}



#ifdef CONFIG_CCW_CONSOLE
@@ -623,7 +620,7 @@ void cio_tsch(struct subchannel *sch) 
		local_bh_disable();

		irq_enter();

	}

	kstat_incr_irqs_this_cpu(IO_INTERRUPT, irq_desc_io);

	kstat_incr_irq_this_cpu(IO_INTERRUPT);

	if (sch->driver && sch->driver->irq)

		sch->driver->irq(sch);

	else