Commit 8cdd4572 authored by Lennert Buytenhek's avatar Lennert Buytenhek

ARM: ITE 8152: irq_data conversion.

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
parent 7d1f4288
...@@ -31,8 +31,10 @@ ...@@ -31,8 +31,10 @@
#define MAX_SLOTS 21 #define MAX_SLOTS 21
static void it8152_mask_irq(unsigned int irq) static void it8152_mask_irq(struct irq_data *d)
{ {
unsigned int irq = d->irq;
if (irq >= IT8152_LD_IRQ(0)) { if (irq >= IT8152_LD_IRQ(0)) {
__raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) | __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) |
(1 << (irq - IT8152_LD_IRQ(0)))), (1 << (irq - IT8152_LD_IRQ(0)))),
...@@ -48,8 +50,10 @@ static void it8152_mask_irq(unsigned int irq) ...@@ -48,8 +50,10 @@ static void it8152_mask_irq(unsigned int irq)
} }
} }
static void it8152_unmask_irq(unsigned int irq) static void it8152_unmask_irq(struct irq_data *d)
{ {
unsigned int irq = d->irq;
if (irq >= IT8152_LD_IRQ(0)) { if (irq >= IT8152_LD_IRQ(0)) {
__raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) & __raw_writel((__raw_readl(IT8152_INTC_LDCNIMR) &
~(1 << (irq - IT8152_LD_IRQ(0)))), ~(1 << (irq - IT8152_LD_IRQ(0)))),
...@@ -67,9 +71,9 @@ static void it8152_unmask_irq(unsigned int irq) ...@@ -67,9 +71,9 @@ static void it8152_unmask_irq(unsigned int irq)
static struct irq_chip it8152_irq_chip = { static struct irq_chip it8152_irq_chip = {
.name = "it8152", .name = "it8152",
.ack = it8152_mask_irq, .irq_ack = it8152_mask_irq,
.mask = it8152_mask_irq, .irq_mask = it8152_mask_irq,
.unmask = it8152_unmask_irq, .irq_unmask = it8152_unmask_irq,
}; };
void it8152_init_irq(void) void it8152_init_irq(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment