diff options
Diffstat (limited to 'arch/arm/common')
-rw-r--r-- | arch/arm/common/it8152.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 42ff90b46dfb..978e83217311 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
@@ -31,8 +31,10 @@ | |||
31 | 31 | ||
32 | #define MAX_SLOTS 21 | 32 | #define MAX_SLOTS 21 |
33 | 33 | ||
34 | static void it8152_mask_irq(unsigned int irq) | 34 | static void it8152_mask_irq(struct irq_data *d) |
35 | { | 35 | { |
36 | unsigned int irq = d->irq; | ||
37 | |||
36 | if (irq >= IT8152_LD_IRQ(0)) { | 38 | if (irq >= IT8152_LD_IRQ(0)) { |
37 | __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) | | 39 | __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) | |
38 | (1 << (irq - IT8152_LD_IRQ(0)))), | 40 | (1 << (irq - IT8152_LD_IRQ(0)))), |
@@ -48,8 +50,10 @@ static void it8152_mask_irq(unsigned int irq) | |||
48 | } | 50 | } |
49 | } | 51 | } |
50 | 52 | ||
51 | static void it8152_unmask_irq(unsigned int irq) | 53 | static void it8152_unmask_irq(struct irq_data *d) |
52 | { | 54 | { |
55 | unsigned int irq = d->irq; | ||
56 | |||
53 | if (irq >= IT8152_LD_IRQ(0)) { | 57 | if (irq >= IT8152_LD_IRQ(0)) { |
54 | __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) & | 58 | __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) & |
55 | ~(1 << (irq - IT8152_LD_IRQ(0)))), | 59 | ~(1 << (irq - IT8152_LD_IRQ(0)))), |
@@ -67,9 +71,9 @@ static void it8152_unmask_irq(unsigned int irq) | |||
67 | 71 | ||
68 | static struct irq_chip it8152_irq_chip = { | 72 | static struct irq_chip it8152_irq_chip = { |
69 | .name = "it8152", | 73 | .name = "it8152", |
70 | .ack = it8152_mask_irq, | 74 | .irq_ack = it8152_mask_irq, |
71 | .mask = it8152_mask_irq, | 75 | .irq_mask = it8152_mask_irq, |
72 | .unmask = it8152_unmask_irq, | 76 | .irq_unmask = it8152_unmask_irq, |
73 | }; | 77 | }; |
74 | 78 | ||
75 | void it8152_init_irq(void) | 79 | void it8152_init_irq(void) |