ARM: S3C24XX: modify s3c2412 irq init to initialize all irqs

Combines the two independent init steps for the irqs into one.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-s3c24xx/common.h b/arch/arm/mach-s3c24xx/common.h
index 362a8cd32eb0cb840db5ac1549a7f38ab901bcf9..abefeb38bba4dbcdc150079bc19505912d3538ea 100644 (file)
--- a/arch/arm/mach-s3c24xx/common.h
+++ b/arch/arm/mach-s3c24xx/common.h
@@ -36,6 +36,7 @@ extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);
 extern void s3c2412_init_clocks(int xtal);
 extern  int s3c2412_baseclk_add(void);
 extern void s3c2412_restart(char mode, const char *cmd);
+extern void s3c2412_init_irq(void);
 #else
 #define s3c2412_init_clocks NULL
 #define s3c2412_init_uarts NULL

diff --git a/arch/arm/mach-s3c24xx/irq.c b/arch/arm/mach-s3c24xx/irq.c
index 2bb4a97e527efc9ba096f16616323e4148866f39..55a73c4d2c955e3ed162a432b8fb7a2adc39b7ee 100644 (file)
--- a/arch/arm/mach-s3c24xx/irq.c
+++ b/arch/arm/mach-s3c24xx/irq.c
@@ -743,10 +743,12 @@ static struct irq_chip s3c2412_irq_cfsdi = {
        .irq_unmask     = s3c2412_irq_cfsdi_unmask,
 };
 
-static int s3c2412_irq_add(struct device *dev, struct subsys_interface *sif)
+void s3c2412_init_irq(void)
 {
        unsigned int irqno;
 
+       s3c24xx_init_irq();
+
        for (irqno = IRQ_EINT0; irqno <= IRQ_EINT3; irqno++) {
                irq_set_chip_and_handler(irqno, &s3c2412_irq_eint0t4,
                                         handle_edge_irq);
@@ -762,22 +764,7 @@ static int s3c2412_irq_add(struct device *dev, struct subsys_interface *sif)
                                         handle_level_irq);
                set_irq_flags(irqno, IRQF_VALID);
        }
-
-       return 0;
 }
-
-static struct subsys_interface s3c2412_irq_interface = {
-       .name           = "s3c2412_irq",
-       .subsys         = &s3c2412_subsys,
-       .add_dev        = s3c2412_irq_add,
-};
-
-static int s3c2412_irq_init(void)
-{
-       return subsys_interface_register(&s3c2412_irq_interface);
-}
-
-arch_initcall(s3c2412_irq_init);
 #endif
 
 #ifdef CONFIG_CPU_S3C2416

diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index aade943288c788d0a79a1bc05850432e42e27835..a45fcd8ccf796016c9007d0d7a44e089f30a9497 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -660,7 +660,7 @@ MACHINE_START(JIVE, "JIVE")
        /* Maintainer: Ben Dooks <ben-linux@fluff.org> */
        .atag_offset    = 0x100,
 
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2412_init_irq,
        .map_io         = jive_map_io,
        .init_machine   = jive_machine_init,
        .init_time      = samsung_timer_init,

diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c
index 8e3f1d9bbb7c602b5d9319d362a0656841fc5ff0..8146e920f10d67313bbae45ddc81f47735eb67d1 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-smdk2413.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c
@@ -130,7 +130,7 @@ MACHINE_START(S3C2413, "S3C2413")
        .atag_offset    = 0x100,
 
        .fixup          = smdk2413_fixup,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2412_init_irq,
        .map_io         = smdk2413_map_io,
        .init_machine   = smdk2413_machine_init,
        .init_time      = samsung_timer_init,
@@ -142,7 +142,7 @@ MACHINE_START(SMDK2412, "SMDK2412")
        .atag_offset    = 0x100,
 
        .fixup          = smdk2413_fixup,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2412_init_irq,
        .map_io         = smdk2413_map_io,
        .init_machine   = smdk2413_machine_init,
        .init_time      = samsung_timer_init,
@@ -154,7 +154,7 @@ MACHINE_START(SMDK2413, "SMDK2413")
        .atag_offset    = 0x100,
 
        .fixup          = smdk2413_fixup,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2412_init_irq,
        .map_io         = smdk2413_map_io,
        .init_machine   = smdk2413_machine_init,
        .init_time      = samsung_timer_init,

diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index 622a1ed24509a6a0f230bf14e87145cacad231f9..b66588428ec90e7b0d4c056f60e8ddc2e5dc36be 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -158,7 +158,7 @@ MACHINE_START(VSTMS, "VSTMS")
        .atag_offset    = 0x100,
 
        .fixup          = vstms_fixup,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2412_init_irq,
        .init_machine   = vstms_init,
        .map_io         = vstms_map_io,
        .init_time      = samsung_timer_init,