summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-hip04.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-01 01:21:11 +0300
committerMark Brown <broonie@kernel.org>2015-10-01 01:21:11 +0300
commit5c0e869357454c2aab3d02d002ffc1f0a0ab2782 (patch)
treede3bf0f70d24fc33d791f776513593da5217ea08 /drivers/irqchip/irq-hip04.c
parentbaafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff)
parented14ee0eea8b6808025356cecc87a8007885263f (diff)
downloadlinux-5c0e869357454c2aab3d02d002ffc1f0a0ab2782.tar.xz
Merge tag 'asoc-fix-v4.3-rc2' into asoc-pxa
ASoC: Fixes for v4.3 A disappointingly large set of fixes, though none of them very big and very widely spread over many different drivers. Nothing especially stands out, it's mostly all device specific and relatively minor.
Diffstat (limited to 'drivers/irqchip/irq-hip04.c')
-rw-r--r--drivers/irqchip/irq-hip04.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-hip04.c b/drivers/irqchip/irq-hip04.c
index a0128c7c98dd..8f3ca8f3a62b 100644
--- a/drivers/irqchip/irq-hip04.c
+++ b/drivers/irqchip/irq-hip04.c
@@ -307,11 +307,11 @@ static int hip04_irq_domain_map(struct irq_domain *d, unsigned int irq,
irq_set_percpu_devid(irq);
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_percpu_devid_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);
+ irq_set_status_flags(irq, IRQ_NOAUTOEN);
} else {
irq_set_chip_and_handler(irq, &hip04_irq_chip,
handle_fasteoi_irq);
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+ irq_set_probe(irq);
}
irq_set_chip_data(irq, d->host_data);
return 0;