ARM: S3C24XX: remove plat-samsung/irq.h
Subsystems (3)
PATCH 1/1 ARM: S3C24XX: remove plat-samsung/irq.h
plat-samsung/irq.h did only contain functions for handling the spread out subirqs on s3c24xx arches, which are not needed anymore.
---
Sorry for bringing this separate submission, but I just remembered it this evening.
This applies on top of all the other s3c24xx irq changes and I think this patch will mark the end of the irq-cleanup for now.
arch/arm/mach-s3c24xx/irq-pm.c | 7 ++- arch/arm/mach-s3c24xx/irq.c | 8 +-- arch/arm/plat-samsung/include/plat/irq.h | 116 ------------------------------ 3 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h
arch/arm/mach-s3c24xx/irq-pm.c +6 -1
@@ -16,10 +16,15 @@#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/syscore_ops.h> +#include <linux/io.h> #include <plat/cpu.h> #include <plat/pm.h> -#include <plat/irq.h> +#include <plat/map-base.h> +#include <plat/map-s3c.h> + +#include <mach/regs-irq.h> +#include <mach/regs-gpio.h> #include <asm/irq.h>
arch/arm/mach-s3c24xx/irq.c +3 -5
@@ -34,7 +34,6 @@#include <plat/cpu.h> #include <plat/regs-irqtype.h> #include <plat/pm.h> -#include <plat/irq.h> #define S3C_IRQTYPE_NONE 0#define S3C_IRQTYPE_EINT 1
@@ -175,8 +174,7 @@ static int s3c_irqext_type_set(void __iomem *gpcon_reg,return 0 ; } -/* FIXME: make static when it's out of plat-samsung/irq.h */ -int s3c_irqext_type (struct irq_data *data,unsigned int type) +static int s3c_irqext_type (struct irq_data *data,unsigned int type) {void __iomem *extint_reg;void __iomem *gpcon_reg;
@@ -224,7 +222,7 @@ static int s3c_irqext0_type(struct irq_data *data, unsigned int type) extint_offset, type); } -struct irq_chip s3c_irq_chip = { +static struct irq_chip s3c_irq_chip = { .name ="s3c" , .irq_ack = s3c_irq_ack, .irq_mask = s3c_irq_mask,
@@ -232,7 +230,7 @@ struct irq_chip s3c_irq_chip = { .irq_set_wake = s3c_irq_wake }; -struct irq_chip s3c_irq_level_chip = { +static struct irq_chip s3c_irq_level_chip = { .name ="s3c-level" , .irq_mask = s3c_irq_mask, .irq_unmask = s3c_irq_unmask,
arch/arm/plat-samsung/include/plat/irq.h deleted +0 -116
116 lines not on this page · raw message
Signature · 1 line
1.7.2.3
Kukjin Kim
AppliedPATCH 1/1 ARM: S3C24XX: remove plat-samsung/irq.h
Quoted 9 lines · Heiko St?bner
plat-samsung/irq.hdid only contain functions for handling the spread out subirqs on s3c24xx arches, which are not needed anymore.Signed-off-by Heiko Stuebner <[email protected]>---
Sorry for bringing this separate submission, but I just remembered it this evening.
Quoted 9 lines
This applies on top of all the other s3c24xx irq changes and I think this patch will mark the end of the irq-cleanup for now.
arch/arm/mach-s3c24xx/irq-pm.c | 7 ++- arch/arm/mach-s3c24xx/irq.c | 8 +-- arch/arm/plat-samsung/include/plat/irq.h | 116 ------------------------------ 3 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h
Applied, thanks :-)
- Kukjin
PATCH 1/1 ARM: S3C24XX: remove plat-samsung/irq.h
In reply to Heiko StübnerQuoted 14 lines · Kukjin Kim
Quoted 12 lines · Heiko St?bner
plat-samsung/irq.hdid only contain functions for handling the spread out subirqs on s3c24xx arches, which are not needed anymore.Signed-off-by Heiko Stuebner <[email protected]>---
Sorry for bringing this separate submission, but I just remembered it this evening.This applies on top of all the other s3c24xx irq changes and I think this patch will mark the end of the irq-cleanup for now.
Quoted 9 lines
Quoted 7 lines
arch/arm/mach-s3c24xx/irq-pm.c | 7 ++- arch/arm/mach-s3c24xx/irq.c | 8 +-- arch/arm/plat-samsung/include/plat/irq.h | 116 ------------------------------ 3 files changed, 9 insertions(+), 122 deletions(-) delete mode100644
arch/arm/plat-samsung/include/plat/irq.hApplied, thanks :-)
Just note, happens following error:
arch/arm/mach-s3c24xx/bast-irq.c:37:22: fatal error: plat/irq.h: No such file or directory compilation terminated.
...
make[2]: *** [arch/arm/mach-s3c24xx/bast-irq.o] Error 1
make[2]: *** Waiting for unfinished jobs....
CC crypto/testmgr.o CC lib/bsearch.o AS arch/arm/lib/memcpy.o AS arch/arm/lib/memmove.o
make[1]: *** [arch/arm/mach-s3c24xx] Error 2
make[1]: *** Waiting for unfinished jobs....
I fixed when I applied.
Thanks.
- Kukjin