git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
52xx
/
mpc52xx_pic.c
diff --git
a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index
9f3ed58
..
1dd1540
100644
(file)
--- a/
arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/
arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@
-214,7
+214,7
@@
static int mpc52xx_extirq_set_type(struct irq_data *d, unsigned int flow_type)
ctrl_reg |= (type << (22 - (l2irq * 2)));
out_be32(&intr->ctrl, ctrl_reg);
ctrl_reg |= (type << (22 - (l2irq * 2)));
out_be32(&intr->ctrl, ctrl_reg);
- __
set_irq_handler_un
locked(d->irq, handler);
+ __
irq_set_handler_
locked(d->irq, handler);
return 0;
}
return 0;
}
@@
-414,7
+414,7
@@
static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
else
hndlr = handle_level_irq;
else
hndlr = handle_level_irq;
-
set_irq
_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
+
irq_set
_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
__func__, l2irq, virq, (int)irq, type);
return 0;
pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
__func__, l2irq, virq, (int)irq, type);
return 0;
@@
-431,7
+431,7
@@
static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
return -EINVAL;
}
return -EINVAL;
}
-
set_irq
_chip_and_handler(virq, irqchip, handle_level_irq);
+
irq_set
_chip_and_handler(virq, irqchip, handle_level_irq);
pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
return 0;
pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
return 0;
@@
-512,7
+512,7
@@
void __init mpc52xx_init_irq(void)
/**
* mpc52xx_get_irq - Get pending interrupt number hook function
*
/**
* mpc52xx_get_irq - Get pending interrupt number hook function
*
- * Called by the interupt handler to determine what IRQ handler needs to be
+ * Called by the inter
r
upt handler to determine what IRQ handler needs to be
* executed.
*
* Status of pending interrupts is determined by reading the encoded status
* executed.
*
* Status of pending interrupts is determined by reading the encoded status