redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: S3C64XX: Convert S3C64xx irq-eint to use new irq_ methods

Browse source 
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data
rather than an irq number. Conver S3C64xx irq-eint to use this with a
simple textual substitution.

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>
This commit is contained in:
Mark Brown 2010-12-02 14:35:38 +09:00 committed by Kukjin Kim
parent f5aeffb784
commit c35cd6ec36
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/mach-s3c64xx/irq-eint.c
View file

@ -32,39 +32,39 @@
#define eint_offset(irq) ((irq) - IRQ_EINT(0)) #define eint_offset(irq) ((irq) - IRQ_EINT(0))
#define eint_irq_to_bit(irq) (1 << eint_offset(irq)) #define eint_irq_to_bit(irq) (1 << eint_offset(irq))
static inline void s3c_irq_eint_mask(unsigned int irq) static inline void s3c_irq_eint_mask(struct irq_data *data)
{ {
u32 mask; u32 mask;
mask = __raw_readl(S3C64XX_EINT0MASK); mask = __raw_readl(S3C64XX_EINT0MASK);
mask |= eint_irq_to_bit(irq); mask |= eint_irq_to_bit(data->irq);
__raw_writel(mask, S3C64XX_EINT0MASK); __raw_writel(mask, S3C64XX_EINT0MASK);
} }
static void s3c_irq_eint_unmask(unsigned int irq) static void s3c_irq_eint_unmask(struct irq_data *data)
{ {
u32 mask; u32 mask;
mask = __raw_readl(S3C64XX_EINT0MASK); mask = __raw_readl(S3C64XX_EINT0MASK);
mask &= ~eint_irq_to_bit(irq); mask &= ~eint_irq_to_bit(data->irq);
__raw_writel(mask, S3C64XX_EINT0MASK); __raw_writel(mask, S3C64XX_EINT0MASK);
} }
static inline void s3c_irq_eint_ack(unsigned int irq) static inline void s3c_irq_eint_ack(struct irq_data *data)
{ {
__raw_writel(eint_irq_to_bit(irq), S3C64XX_EINT0PEND); __raw_writel(eint_irq_to_bit(data->irq), S3C64XX_EINT0PEND);
} }
static void s3c_irq_eint_maskack(unsigned int irq) static void s3c_irq_eint_maskack(struct irq_data *data)
{ {
/* compiler should in-line these */ /* compiler should in-line these */
s3c_irq_eint_mask(irq); s3c_irq_eint_mask(data);
s3c_irq_eint_ack(irq); s3c_irq_eint_ack(data);
} }
static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type) static int s3c_irq_eint_set_type(struct irq_data *data, unsigned int type)
{ {
int offs = eint_offset(irq); int offs = eint_offset(data->irq);
int pin, pin_val; int pin, pin_val;
int shift; int shift;
u32 ctrl, mask; u32 ctrl, mask;
@ -140,11 +140,11 @@ static int s3c_irq_eint_set_type(unsigned int irq, unsigned int type)
static struct irq_chip s3c_irq_eint = { static struct irq_chip s3c_irq_eint = {
.name = "s3c-eint", .name = "s3c-eint",
.mask = s3c_irq_eint_mask, .irq_mask = s3c_irq_eint_mask,
.unmask = s3c_irq_eint_unmask, .irq_unmask = s3c_irq_eint_unmask,
.mask_ack = s3c_irq_eint_maskack, .irq_mask_ack = s3c_irq_eint_maskack,
.ack = s3c_irq_eint_ack, .irq_ack = s3c_irq_eint_ack,
.set_type = s3c_irq_eint_set_type, .irq_set_type = s3c_irq_eint_set_type,
.irq_set_wake = s3c_irqext_wake, .irq_set_wake = s3c_irqext_wake,
}; };