lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: LoCoMo: irq_data conversion.

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
This commit is contained in:
Lennert Buytenhek
2010-11-29 10:19:01 +01:00
parent 8cdd4572ea
commit 680244df88
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/common/locomo.c
View File

@@ -144,7 +144,7 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc)
int req, i; int req, i;
/* Acknowledge the parent IRQ */ /* Acknowledge the parent IRQ */
desc->chip->ack(irq); desc->irq_data.chip->irq_ack(&desc->irq_data);
/* check why this interrupt was generated */ /* check why this interrupt was generated */
req = locomo_readl(lchip->base + LOCOMO_ICR) & 0x0f00; req = locomo_readl(lchip->base + LOCOMO_ICR) & 0x0f00;
@@ -161,33 +161,33 @@ static void locomo_handler(unsigned int irq, struct irq_desc *desc)
} }
} }
static void locomo_ack_irq(unsigned int irq) static void locomo_ack_irq(struct irq_data *d)
{ {
} }
static void locomo_mask_irq(unsigned int irq) static void locomo_mask_irq(struct irq_data *d)
{ {
struct locomo *lchip = get_irq_chip_data(irq); struct locomo *lchip = irq_data_get_irq_chip_data(d);
unsigned int r; unsigned int r;
r = locomo_readl(lchip->base + LOCOMO_ICR); r = locomo_readl(lchip->base + LOCOMO_ICR);
r &= ~(0x0010 << (irq - lchip->irq_base)); r &= ~(0x0010 << (d->irq - lchip->irq_base));
locomo_writel(r, lchip->base + LOCOMO_ICR); locomo_writel(r, lchip->base + LOCOMO_ICR);
} }
static void locomo_unmask_irq(unsigned int irq) static void locomo_unmask_irq(struct irq_data *d)
{ {
struct locomo *lchip = get_irq_chip_data(irq); struct locomo *lchip = irq_data_get_irq_chip_data(d);
unsigned int r; unsigned int r;
r = locomo_readl(lchip->base + LOCOMO_ICR); r = locomo_readl(lchip->base + LOCOMO_ICR);
r |= (0x0010 << (irq - lchip->irq_base)); r |= (0x0010 << (d->irq - lchip->irq_base));
locomo_writel(r, lchip->base + LOCOMO_ICR); locomo_writel(r, lchip->base + LOCOMO_ICR);
} }
static struct irq_chip locomo_chip = { static struct irq_chip locomo_chip = {
.name = "LOCOMO", .name = "LOCOMO",
.ack = locomo_ack_irq, .irq_ack = locomo_ack_irq,
.mask = locomo_mask_irq, .irq_mask = locomo_mask_irq,
.unmask = locomo_unmask_irq, .irq_unmask = locomo_unmask_irq,
}; };
static void locomo_setup_irq(struct locomo *lchip) static void locomo_setup_irq(struct locomo *lchip)