projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'staging-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
sysdev
/
ipic.c
diff --git
a/arch/powerpc/sysdev/ipic.c
b/arch/powerpc/sysdev/ipic.c
index 6b2b689148104a25003fba7380af676f2a85e055..b1297ab1599b46ef24457ec890b28b69ba4dc0bf 100644
(file)
--- a/
arch/powerpc/sysdev/ipic.c
+++ b/
arch/powerpc/sysdev/ipic.c
@@
-624,10
+624,10
@@
static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
irqd_set_trigger_type(d, flow_type);
if (flow_type & IRQ_TYPE_LEVEL_LOW) {
irqd_set_trigger_type(d, flow_type);
if (flow_type & IRQ_TYPE_LEVEL_LOW) {
-
__irq_set_handler_locked(d->irq
, handle_level_irq);
+
irq_set_handler_locked(d
, handle_level_irq);
d->chip = &ipic_level_irq_chip;
} else {
d->chip = &ipic_level_irq_chip;
} else {
-
__irq_set_handler_locked(d->irq
, handle_edge_irq);
+
irq_set_handler_locked(d
, handle_edge_irq);
d->chip = &ipic_edge_irq_chip;
}
d->chip = &ipic_edge_irq_chip;
}