Skip to content

L
linux
Commit cb55bc5f authored by Lennert Buytenhek's avatar Lennert Buytenhek
Browse files
Options

ARM: stmp37xx: irq_data conversion. 

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
parent 7940848a
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
arch/arm/mach-stmp37xx/stmp37xx.c
View file @ cb55bc5f
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
/* /*
* IRQ handling * IRQ handling
*/ */
static void stmp37xx_ack_irq(unsigned int irq) static void stmp37xx_ack_irq(struct irq_data *d)
{ {
/* Disable IRQ */ /* Disable IRQ */
stmp3xxx_clearl(0x04 << ((irq % 4) * 8), stmp3xxx_clearl(0x04 << ((d->irq % 4) * 8),
REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + irq / 4 * 0x10); REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
/* ACK current interrupt */ /* ACK current interrupt */
__raw_writel(1, REGS_ICOLL_BASE + HW_ICOLL_LEVELACK); __raw_writel(1, REGS_ICOLL_BASE + HW_ICOLL_LEVELACK);
...@@ -56,24 +56,24 @@ static void stmp37xx_ack_irq(unsigned int irq) ...@@ -56,24 +56,24 @@ static void stmp37xx_ack_irq(unsigned int irq)
(void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT); (void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
} }
static void stmp37xx_mask_irq(unsigned int irq) static void stmp37xx_mask_irq(struct irq_data *d)
{ {
/* IRQ disable */ /* IRQ disable */
stmp3xxx_clearl(0x04 << ((irq % 4) * 8), stmp3xxx_clearl(0x04 << ((d->irq % 4) * 8),
REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + irq / 4 * 0x10); REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
} }
static void stmp37xx_unmask_irq(unsigned int irq) static void stmp37xx_unmask_irq(struct irq_data *d)
{ {
/* IRQ enable */ /* IRQ enable */
stmp3xxx_setl(0x04 << ((irq % 4) * 8), stmp3xxx_setl(0x04 << ((d->irq % 4) * 8),
REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + irq / 4 * 0x10); REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
} }
static struct irq_chip stmp37xx_chip = { static struct irq_chip stmp37xx_chip = {
.ack = stmp37xx_ack_irq, .irq_ack = stmp37xx_ack_irq,
.mask = stmp37xx_mask_irq, .irq_mask = stmp37xx_mask_irq,
.unmask = stmp37xx_unmask_irq, .irq_unmask = stmp37xx_unmask_irq,
}; };
void __init stmp37xx_init_irq(void) void __init stmp37xx_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7