diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-01 01:21:11 +0300 |
| commit | 5c0e869357454c2aab3d02d002ffc1f0a0ab2782 (patch) | |
| tree | de3bf0f70d24fc33d791f776513593da5217ea08 /drivers/irqchip/irq-vic.c | |
| parent | baafd373e9287f20ca0c9a6bb38eb6785a146ac2 (diff) | |
| parent | ed14ee0eea8b6808025356cecc87a8007885263f (diff) | |
| download | linux-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-vic.c')
| -rw-r--r-- | drivers/irqchip/irq-vic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index 03846dff4212..b956dfffe78c 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -201,7 +201,7 @@ static int vic_irqdomain_map(struct irq_domain *d, unsigned int irq, return -EPERM; irq_set_chip_and_handler(irq, &vic_chip, handle_level_irq); irq_set_chip_data(irq, v->base); - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); + irq_set_probe(irq); return 0; } @@ -225,7 +225,7 @@ static int handle_one_vic(struct vic_device *vic, struct pt_regs *regs) return handled; } -static void vic_handle_irq_cascaded(unsigned int irq, struct irq_desc *desc) +static void vic_handle_irq_cascaded(struct irq_desc *desc) { u32 stat, hwirq; struct irq_chip *host_chip = irq_desc_get_chip(desc); |