dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

powerpc: platforms/86xx irq_data conversion. 

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Lennert Buytenhek 2011-03-07 13:59:23 +00:00 committed by Benjamin Herrenschmidt
parent 712d5d799a
commit 5b250889b3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/powerpc/platforms/86xx/gef_pic.c
View File

@ -95,6 +95,7 @@ static int gef_pic_cascade_irq;
void gef_pic_cascade(unsigned int irq, struct irq_desc *desc) void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc);
unsigned int cascade_irq; unsigned int cascade_irq;
/* /*
@ -106,17 +107,16 @@ void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq); chip->irq_eoi(&desc->irq_data);
} }
static void gef_pic_mask(unsigned int virq) static void gef_pic_mask(struct irq_data *d)
{ {
unsigned long flags; unsigned long flags;
unsigned int hwirq; unsigned int hwirq;
u32 mask; u32 mask;
hwirq = gef_irq_to_hw(virq); hwirq = gef_irq_to_hw(d->irq);
raw_spin_lock_irqsave(&gef_pic_lock, flags); raw_spin_lock_irqsave(&gef_pic_lock, flags);
mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
@ -125,21 +125,21 @@ static void gef_pic_mask(unsigned int virq)
raw_spin_unlock_irqrestore(&gef_pic_lock, flags); raw_spin_unlock_irqrestore(&gef_pic_lock, flags);
} }
static void gef_pic_mask_ack(unsigned int virq) static void gef_pic_mask_ack(struct irq_data *d)
{ {
/* Don't think we actually have to do anything to ack an interrupt, /* Don't think we actually have to do anything to ack an interrupt,
* we just need to clear down the devices interrupt and it will go away * we just need to clear down the devices interrupt and it will go away
*/ */
gef_pic_mask(virq); gef_pic_mask(d);
} }
static void gef_pic_unmask(unsigned int virq) static void gef_pic_unmask(struct irq_data *d)
{ {
unsigned long flags; unsigned long flags;
unsigned int hwirq; unsigned int hwirq;
u32 mask; u32 mask;
hwirq = gef_irq_to_hw(virq); hwirq = gef_irq_to_hw(d->irq);
raw_spin_lock_irqsave(&gef_pic_lock, flags); raw_spin_lock_irqsave(&gef_pic_lock, flags);
mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0)); mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
@ -150,9 +150,9 @@ static void gef_pic_unmask(unsigned int virq)
static struct irq_chip gef_pic_chip = { static struct irq_chip gef_pic_chip = {
.name = "gefp", .name = "gefp",
.mask = gef_pic_mask, .irq_mask = gef_pic_mask,
.mask_ack = gef_pic_mask_ack, .irq_mask_ack = gef_pic_mask_ack,
.unmask = gef_pic_unmask, .irq_unmask = gef_pic_unmask,
}; };

5
arch/powerpc/platforms/86xx/pic.c
View File

@ -19,10 +19,13 @@
#ifdef CONFIG_PPC_I8259 #ifdef CONFIG_PPC_I8259
static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc) static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
{ {
struct irq_chip *chip = get_irq_desc_chip(desc);
unsigned int cascade_irq = i8259_irq(); unsigned int cascade_irq = i8259_irq();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq);
chip->irq_eoi(&desc->irq_data);
} }
#endif /* CONFIG_PPC_I8259 */ #endif /* CONFIG_PPC_I8259 */