Skip to content

Commit

Permalink
powerpc: platforms/512x irq_data conversion.
Browse files Browse the repository at this point in the history 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Lennert Buytenhek authored and Benjamin Herrenschmidt committed Mar 10, 2011
1 parent 835c055 commit 0eb3157
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ irq_to_pic_bit(unsigned int irq)
}

static void
cpld_mask_irq(unsigned int irq)
cpld_mask_irq(struct irq_data *d)
{
unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);

out_8(pic_mask,
in_8(pic_mask) | irq_to_pic_bit(cpld_irq));
}

static void
cpld_unmask_irq(unsigned int irq)
cpld_unmask_irq(struct irq_data *d)
{
unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);

out_8(pic_mask,
Expand All @@ -80,9 +80,9 @@ cpld_unmask_irq(unsigned int irq)

static struct irq_chip cpld_pic = {
.name = "CPLD PIC",
.mask = cpld_mask_irq,
.ack = cpld_mask_irq,
.unmask = cpld_unmask_irq,
.irq_mask = cpld_mask_irq,
.irq_ack = cpld_mask_irq,
.irq_unmask = cpld_unmask_irq,
};

static int
Expand Down

0 comments on commit 0eb3157

Please sign in to comment.