ARM: S3C24XX: remove maskack irq ack funtions
From: Heiko Stuebner <heiko@...> Date: Sat, 15 Dec 2012 02:20:06 +0100
Commit-Message
In the past level irqs provided a special ack handler that also masked the interrupt. But handle_level_irq also does mask-ack the interrupt itself, so there is no need to keep this special ack function around. We therefore can simplyfy the number of irq-chips again. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/plat-s3c24xx/irq.c | 41 +++++++++-------------------------------- 1 files changed, 9 insertions(+), 32 deletions(-)
Statistics
- 9 lines added
- 32 lines removed
Changes
------------------------- arch/arm/plat-s3c24xx/irq.c --------------------------
index 8cba552..0516cbc 100644
@@ -128,12 +128,6 @@ static inline void s3c_irq_ack(struct irq_data *data)
__raw_writel(bitval, intc->reg_intpnd);
}
#ifdef CONFIG_PM
/* state for IRQs over sleep
*
@@ -164,22 +158,6 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state)
}
#endif
static int s3c_irqext_type_set(void __iomem *gpcon_reg,
void __iomem *extint_reg,
unsigned long gpcon_offset,
@@ -299,17 +277,16 @@ static struct irq_chip s3c_irq_eint0t4 = {
.irq_set_type = s3c_irqext0_type,
};
+struct irq_chip s3c_irq_chip = {
+ .name = "s3c",
+ .irq_ack = s3c_irq_ack,
.irq_mask = s3c_irq_mask,
.irq_unmask = s3c_irq_unmask,
+ .irq_set_wake = s3c_irq_wake
};
+static struct irq_chip s3c_irq_general_chip = {
+ .name = "s3c-general",
.irq_mask = s3c_irq_mask,
.irq_unmask = s3c_irq_unmask,
.irq_ack = s3c_irq_ack,
@@ -412,7 +389,7 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
case S3C_IRQTYPE_EDGE:
if (irq_data->parent_irq ||
intc->reg_pending == S3C2416_SRCPND2)
+ irq_set_chip_and_handler(virq, &s3c_irq_general_chip,
handle_edge_irq);
else
irq_set_chip_and_handler(virq, &s3c_irq_chip,
@@ -420,10 +397,10 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
break;
case S3C_IRQTYPE_LEVEL:
if (irq_data->parent_irq)
+ irq_set_chip_and_handler(virq, &s3c_irq_general_chip,
handle_level_irq);
else
+ irq_set_chip_and_handler(virq, &s3c_irq_chip,
handle_level_irq);
break;
default: