diff options
Diffstat (limited to 'arch/arm/mach-s3c2443/irq.c')
-rw-r--r-- | arch/arm/mach-s3c2443/irq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2443/irq.c b/arch/arm/mach-s3c2443/irq.c index 9674de7223fd..e44341d7dfef 100644 --- a/arch/arm/mach-s3c2443/irq.c +++ b/arch/arm/mach-s3c2443/irq.c | |||
@@ -24,10 +24,10 @@ | |||
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
26 | #include <linux/sysdev.h> | 26 | #include <linux/sysdev.h> |
27 | #include <linux/io.h> | ||
27 | 28 | ||
28 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
29 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
30 | #include <asm/io.h> | ||
31 | 31 | ||
32 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
33 | 33 | ||
@@ -44,7 +44,6 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len) | |||
44 | { | 44 | { |
45 | unsigned int subsrc, submsk; | 45 | unsigned int subsrc, submsk; |
46 | unsigned int end; | 46 | unsigned int end; |
47 | struct irq_desc *mydesc; | ||
48 | 47 | ||
49 | /* read the current pending interrupts, and the mask | 48 | /* read the current pending interrupts, and the mask |
50 | * for what it is available */ | 49 | * for what it is available */ |
@@ -57,13 +56,11 @@ static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len) | |||
57 | subsrc &= (1 << len)-1; | 56 | subsrc &= (1 << len)-1; |
58 | 57 | ||
59 | end = len + irq; | 58 | end = len + irq; |
60 | mydesc = irq_desc + irq; | ||
61 | 59 | ||
62 | for (; irq < end && subsrc; irq++) { | 60 | for (; irq < end && subsrc; irq++) { |
63 | if (subsrc & 1) | 61 | if (subsrc & 1) |
64 | desc_handle_irq(irq, mydesc); | 62 | generic_handle_irq(irq); |
65 | 63 | ||
66 | mydesc++; | ||
67 | subsrc >>= 1; | 64 | subsrc >>= 1; |
68 | } | 65 | } |
69 | } | 66 | } |