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 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
sirc.c
diff --git
a/arch/arm/mach-msm/sirc.c
b/arch/arm/mach-msm/sirc.c
index
11b54c7
..
689e78c
100644
(file)
--- a/
arch/arm/mach-msm/sirc.c
+++ b/
arch/arm/mach-msm/sirc.c
@@
-105,10
+105,10
@@
static int sirc_irq_set_type(struct irq_data *d, unsigned int flow_type)
val = readl(sirc_regs.int_type);
if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
val |= mask;
val = readl(sirc_regs.int_type);
if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
val |= mask;
-
irq_desc[d->irq].handle_irq = handle_edge_irq
;
+
__irq_set_handler_locked(d->irq, handle_edge_irq)
;
} else {
val &= ~mask;
} else {
val &= ~mask;
-
irq_desc[d->irq].handle_irq = handle_level_irq
;
+
__irq_set_handler_locked(d->irq, handle_level_irq)
;
}
writel(val, sirc_regs.int_type);
}
writel(val, sirc_regs.int_type);
@@
-158,15
+158,14
@@
void __init msm_init_sirc(void)
wake_enable = 0;
for (i = FIRST_SIRC_IRQ; i < LAST_SIRC_IRQ; i++) {
wake_enable = 0;
for (i = FIRST_SIRC_IRQ; i < LAST_SIRC_IRQ; i++) {
- set_irq_chip(i, &sirc_irq_chip);
- set_irq_handler(i, handle_edge_irq);
+ irq_set_chip_and_handler(i, &sirc_irq_chip, handle_edge_irq);
set_irq_flags(i, IRQF_VALID);
}
for (i = 0; i < ARRAY_SIZE(sirc_reg_table); i++) {
set_irq_flags(i, IRQF_VALID);
}
for (i = 0; i < ARRAY_SIZE(sirc_reg_table); i++) {
-
set_irq
_chained_handler(sirc_reg_table[i].cascade_irq,
+
irq_set
_chained_handler(sirc_reg_table[i].cascade_irq,
sirc_irq_handler);
sirc_irq_handler);
- set_irq_wake(sirc_reg_table[i].cascade_irq, 1);
+
irq_
set_irq_wake(sirc_reg_table[i].cascade_irq, 1);
}
return;
}
}
return;
}