diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2011-03-15 12:08:20 -0400 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-03-15 12:08:22 -0400 |
commit | ee5894fb0f128476dc9afb2ed50cab1427dfe0c3 (patch) | |
tree | 3fce527385ada565b97d7681db11e0fcfb4bc704 /drivers/s390 | |
parent | 2c190da477c9ab167f5bb37414d99ef2063b388a (diff) |
[S390] remove superfluous check from do_IRQ
Don't check for the int_type if an adapter interrupt is presented.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/cio/cio.c | 6 | ||||
-rw-r--r-- | drivers/s390/cio/cio.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 430f875006f2..f3147542e52e 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -630,11 +630,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs) | |||
630 | irb = (struct irb *)&S390_lowcore.irb; | 630 | irb = (struct irb *)&S390_lowcore.irb; |
631 | do { | 631 | do { |
632 | kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++; | 632 | kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++; |
633 | /* | 633 | if (tpi_info->adapter_IO) { |
634 | * Non I/O-subchannel thin interrupts are processed differently | ||
635 | */ | ||
636 | if (tpi_info->adapter_IO == 1 && | ||
637 | tpi_info->int_type == IO_INTERRUPT_TYPE) { | ||
638 | do_adapter_IO(tpi_info->isc); | 634 | do_adapter_IO(tpi_info->isc); |
639 | continue; | 635 | continue; |
640 | } | 636 | } |
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index bf7f80f5a330..7a9032d01fb8 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h | |||
@@ -105,8 +105,6 @@ struct subchannel { | |||
105 | struct schib_config config; | 105 | struct schib_config config; |
106 | } __attribute__ ((aligned(8))); | 106 | } __attribute__ ((aligned(8))); |
107 | 107 | ||
108 | #define IO_INTERRUPT_TYPE 0 /* I/O interrupt type */ | ||
109 | |||
110 | #define to_subchannel(n) container_of(n, struct subchannel, dev) | 108 | #define to_subchannel(n) container_of(n, struct subchannel, dev) |
111 | 109 | ||
112 | extern int cio_validate_subchannel (struct subchannel *, struct subchannel_id); | 110 | extern int cio_validate_subchannel (struct subchannel *, struct subchannel_id); |