projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
arch
/
arm
/
plat-orion
/
gpio.c
diff --git
a/arch/arm/plat-orion/gpio.c
b/arch/arm/plat-orion/gpio.c
index
5168a52
..
79c33ec
100644
(file)
--- a/
arch/arm/plat-orion/gpio.c
+++ b/
arch/arm/plat-orion/gpio.c
@@
-407,9
+407,9
@@
static int gpio_irq_set_type(struct irq_data *d, u32 type)
return 0;
}
return 0;
}
-static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+static void gpio_irq_handler(unsigned
__
irq, struct irq_desc *desc)
{
{
- struct orion_gpio_chip *ochip = irq_
get_handler_data(irq
);
+ struct orion_gpio_chip *ochip = irq_
desc_get_handler_data(desc
);
u32 cause, type;
int i;
u32 cause, type;
int i;
@@
-582,8
+582,9
@@
void __init orion_gpio_init(struct device_node *np,
for (i = 0; i < 4; i++) {
if (irqs[i]) {
for (i = 0; i < 4; i++) {
if (irqs[i]) {
- irq_set_handler_data(irqs[i], ochip);
- irq_set_chained_handler(irqs[i], gpio_irq_handler);
+ irq_set_chained_handler_and_data(irqs[i],
+ gpio_irq_handler,
+ ochip);
}
}
}
}