Skip to content

Commit

Permalink
ARM: S3C64XX: Use chip_data to store the shift for EINTs
Browse files Browse the repository at this point in the history
This makes all the functions that use the shift slightly smaller, one
instruction in most cases but more for ack() and maskack().

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Mark Brown authored and Kukjin Kim committed Dec 30, 2010
1 parent c35cd6e commit 3c91697
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arch/arm/mach-s3c64xx/irq-eint.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
#include <plat/pm.h>

#define eint_offset(irq) ((irq) - IRQ_EINT(0))
#define eint_irq_to_bit(irq) (1 << eint_offset(irq))
#define eint_irq_to_bit(irq) ((u32)(1 << eint_offset(irq)))

static inline void s3c_irq_eint_mask(struct irq_data *data)
{
u32 mask;

mask = __raw_readl(S3C64XX_EINT0MASK);
mask |= eint_irq_to_bit(data->irq);
mask |= (u32)data->chip_data;
__raw_writel(mask, S3C64XX_EINT0MASK);
}

Expand All @@ -46,13 +46,13 @@ static void s3c_irq_eint_unmask(struct irq_data *data)
u32 mask;

mask = __raw_readl(S3C64XX_EINT0MASK);
mask &= ~eint_irq_to_bit(data->irq);
mask &= ~((u32)data->chip_data);
__raw_writel(mask, S3C64XX_EINT0MASK);
}

static inline void s3c_irq_eint_ack(struct irq_data *data)
{
__raw_writel(eint_irq_to_bit(data->irq), S3C64XX_EINT0PEND);
__raw_writel((u32)data->chip_data, S3C64XX_EINT0PEND);
}

static void s3c_irq_eint_maskack(struct irq_data *data)
Expand Down Expand Up @@ -198,6 +198,7 @@ static int __init s3c64xx_init_irq_eint(void)

for (irq = IRQ_EINT(0); irq <= IRQ_EINT(27); irq++) {
set_irq_chip(irq, &s3c_irq_eint);
set_irq_chip_data(irq, (void *)eint_irq_to_bit(irq));
set_irq_handler(irq, handle_level_irq);
set_irq_flags(irq, IRQF_VALID);
}
Expand Down

0 comments on commit 3c91697

Please sign in to comment.