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 'ipvs-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
wm8350-irq.c
diff --git
a/drivers/mfd/wm8350-irq.c
b/drivers/mfd/wm8350-irq.c
index 813ff50f95b699a3ee7784f3f12374f24efbca6c..27054f357b8e565c2afa07cb6845465c61cef944 100644
(file)
--- a/
drivers/mfd/wm8350-irq.c
+++ b/
drivers/mfd/wm8350-irq.c
@@
-526,13
+526,7
@@
int wm8350_irq_init(struct wm8350 *wm8350, int irq,
handle_edge_irq);
irq_set_nested_thread(cur_irq, 1);
handle_edge_irq);
irq_set_nested_thread(cur_irq, 1);
- /* ARM needs us to explicitly flag the IRQ as valid
- * and will set them noprobe when we do so. */
-#ifdef CONFIG_ARM
- set_irq_flags(cur_irq, IRQF_VALID);
-#else
- irq_set_noprobe(cur_irq);
-#endif
+ irq_clear_status_flags(cur_irq, IRQ_NOREQUEST | IRQ_NOPROBE);
}
ret = request_threaded_irq(irq, NULL, wm8350_irq, flags,
}
ret = request_threaded_irq(irq, NULL, wm8350_irq, flags,