[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>

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 430f875006f22b8535d6c179268655e053528962..f3147542e52ee8ce4063245db8147c4cbb434b22 100644 (file)
--- 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)
        irb = (struct irb *)&S390_lowcore.irb;
        do {
                kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
-               /*
-                * Non I/O-subchannel thin interrupts are processed differently
-                */
-               if (tpi_info->adapter_IO == 1 &&
-                   tpi_info->int_type == IO_INTERRUPT_TYPE) {
+               if (tpi_info->adapter_IO) {
                        do_adapter_IO(tpi_info->isc);
                        continue;
                }

diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index bf7f80f5a330b7dc3a5ec26abc9cdbca48e51bb2..7a9032d01fb8391016e70027ace14d96aef33277 100644 (file)
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -105,8 +105,6 @@ struct subchannel {
        struct schib_config config;
 } __attribute__ ((aligned(8)));
 
-#define IO_INTERRUPT_TYPE         0 /* I/O interrupt type */
-
 #define to_subchannel(n) container_of(n, struct subchannel, dev)
 
 extern int cio_validate_subchannel (struct subchannel *, struct subchannel_id);