projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pxa-all' into devel
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-s3c2443
/
irq.c
diff --git
a/arch/arm/mach-s3c2443/irq.c
b/arch/arm/mach-s3c2443/irq.c
index
7565735
..
e44341d
100644
(file)
--- a/
arch/arm/mach-s3c2443/irq.c
+++ b/
arch/arm/mach-s3c2443/irq.c
@@
-23,17
+23,16
@@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
-#include <linux/ptrace.h>
#include <linux/sysdev.h>
#include <linux/sysdev.h>
+#include <linux/io.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/irq.h>
#include <asm/irq.h>
-#include <asm/io.h>
#include <asm/mach/irq.h>
#include <asm/mach/irq.h>
-#include <
asm/ar
ch/regs-irq.h>
-#include <
asm/ar
ch/regs-gpio.h>
+#include <
ma
ch/regs-irq.h>
+#include <
ma
ch/regs-gpio.h>
#include <asm/plat-s3c24xx/cpu.h>
#include <asm/plat-s3c24xx/pm.h>
#include <asm/plat-s3c24xx/cpu.h>
#include <asm/plat-s3c24xx/pm.h>
@@
-45,7
+44,6
@@
static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)
{
unsigned int subsrc, submsk;
unsigned int end;
{
unsigned int subsrc, submsk;
unsigned int end;
- struct irq_desc *mydesc;
/* read the current pending interrupts, and the mask
* for what it is available */
/* read the current pending interrupts, and the mask
* for what it is available */
@@
-58,13
+56,11
@@
static inline void s3c2443_irq_demux(unsigned int irq, unsigned int len)
subsrc &= (1 << len)-1;
end = len + irq;
subsrc &= (1 << len)-1;
end = len + irq;
- mydesc = irq_desc + irq;
for (; irq < end && subsrc; irq++) {
if (subsrc & 1)
for (; irq < end && subsrc; irq++) {
if (subsrc & 1)
-
desc_handle_irq(irq, mydesc
);
+
generic_handle_irq(irq
);
- mydesc++;
subsrc >>= 1;
}
}
subsrc >>= 1;
}
}
@@
-253,7
+249,7
@@
static int __init s3c2443_add_sub(unsigned int base,
return 0;
}
return 0;
}
-static int s3c2443_irq_add(struct sys_device *sysdev)
+static int
__init
s3c2443_irq_add(struct sys_device *sysdev)
{
printk("S3C2443: IRQ Support\n");
{
printk("S3C2443: IRQ Support\n");
@@
-281,7
+277,7
@@
static struct sysdev_driver s3c2443_irq_driver = {
.add = s3c2443_irq_add,
};
.add = s3c2443_irq_add,
};
-static int s3c2443_irq_init(void)
+static int
__init
s3c2443_irq_init(void)
{
return sysdev_driver_register(&s3c2443_sysclass, &s3c2443_irq_driver);
}
{
return sysdev_driver_register(&s3c2443_sysclass, &s3c2443_irq_driver);
}