Commit a2073d54 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Benjamin Herrenschmidt

powerpc: sysdev/cpm1 irq_data conversion.

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 79f26c26
...@@ -56,32 +56,32 @@ static cpic8xx_t __iomem *cpic_reg; ...@@ -56,32 +56,32 @@ static cpic8xx_t __iomem *cpic_reg;
static struct irq_host *cpm_pic_host; static struct irq_host *cpm_pic_host;
static void cpm_mask_irq(unsigned int irq) static void cpm_mask_irq(struct irq_data *d)
{ {
unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq; unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
clrbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec)); clrbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
} }
static void cpm_unmask_irq(unsigned int irq) static void cpm_unmask_irq(struct irq_data *d)
{ {
unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq; unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
setbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec)); setbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
} }
static void cpm_end_irq(unsigned int irq) static void cpm_end_irq(struct irq_data *d)
{ {
unsigned int cpm_vec = (unsigned int)irq_map[irq].hwirq; unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
out_be32(&cpic_reg->cpic_cisr, (1 << cpm_vec)); out_be32(&cpic_reg->cpic_cisr, (1 << cpm_vec));
} }
static struct irq_chip cpm_pic = { static struct irq_chip cpm_pic = {
.name = "CPM PIC", .name = "CPM PIC",
.mask = cpm_mask_irq, .irq_mask = cpm_mask_irq,
.unmask = cpm_unmask_irq, .irq_unmask = cpm_unmask_irq,
.eoi = cpm_end_irq, .irq_eoi = cpm_end_irq,
}; };
int cpm_get_irq(void) int cpm_get_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