diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-23 16:40:17 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-04 11:37:54 -0500 |
commit | bc5dfcff65f24f15567f766d8bd081d594ef8cc2 (patch) | |
tree | 77001148878eb5a3e4949483ccd03a24e71ddb34 | |
parent | a21748c93544901448777b5fa2abe1194c02c6dc (diff) |
s390: Cio: Use the core irq stats function
Let the core do the irq_desc resolution.
No functional change.
Signed-off-by: Thomas 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: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | drivers/s390/cio/cio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 8ee88c4ebd83..f711f0b91104 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -584,8 +584,6 @@ static irqreturn_t do_cio_interrupt(int irq, void *dummy) | |||
584 | return IRQ_HANDLED; | 584 | return IRQ_HANDLED; |
585 | } | 585 | } |
586 | 586 | ||
587 | static struct irq_desc *irq_desc_io; | ||
588 | |||
589 | static struct irqaction io_interrupt = { | 587 | static struct irqaction io_interrupt = { |
590 | .name = "IO", | 588 | .name = "IO", |
591 | .handler = do_cio_interrupt, | 589 | .handler = do_cio_interrupt, |
@@ -596,7 +594,6 @@ void __init init_cio_interrupts(void) | |||
596 | irq_set_chip_and_handler(IO_INTERRUPT, | 594 | irq_set_chip_and_handler(IO_INTERRUPT, |
597 | &dummy_irq_chip, handle_percpu_irq); | 595 | &dummy_irq_chip, handle_percpu_irq); |
598 | setup_irq(IO_INTERRUPT, &io_interrupt); | 596 | setup_irq(IO_INTERRUPT, &io_interrupt); |
599 | irq_desc_io = irq_to_desc(IO_INTERRUPT); | ||
600 | } | 597 | } |
601 | 598 | ||
602 | #ifdef CONFIG_CCW_CONSOLE | 599 | #ifdef CONFIG_CCW_CONSOLE |
@@ -623,7 +620,7 @@ void cio_tsch(struct subchannel *sch) | |||
623 | local_bh_disable(); | 620 | local_bh_disable(); |
624 | irq_enter(); | 621 | irq_enter(); |
625 | } | 622 | } |
626 | kstat_incr_irqs_this_cpu(IO_INTERRUPT, irq_desc_io); | 623 | kstat_incr_irq_this_cpu(IO_INTERRUPT); |
627 | if (sch->driver && sch->driver->irq) | 624 | if (sch->driver && sch->driver->irq) |
628 | sch->driver->irq(sch); | 625 | sch->driver->irq(sch); |
629 | else | 626 | else |