diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-10 19:01:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-10 19:01:58 +0000 |
| commit | 2a148b6f2726ced30f796435f61d6e915c979784 (patch) | |
| tree | 48d233fa5639677b16b10a3442029f3a2e40ef92 /arch/m68k/coldfire/intc-5272.c | |
| parent | 021c5d9469960b8c68aa1d1825f7bfd8d61e157d (diff) | |
| parent | bb9a13a0209c56cdf27d125a1f2f6f34378c64f4 (diff) | |
Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar
ASoC: Updates for v4.4
Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones. Highlights include:
- Updates to the topology userspace interface
- Big updates to the Renesas support from Morimoto-san
- Most of the support for Intel Sky Lake systems.
- New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
S/PDIF.
Diffstat (limited to 'arch/m68k/coldfire/intc-5272.c')
| -rw-r--r-- | arch/m68k/coldfire/intc-5272.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/coldfire/intc-5272.c b/arch/m68k/coldfire/intc-5272.c index 47371de60427..b0a19e207a63 100644 --- a/arch/m68k/coldfire/intc-5272.c +++ b/arch/m68k/coldfire/intc-5272.c @@ -143,12 +143,10 @@ static int intc_irq_set_type(struct irq_data *d, unsigned int type) * We need to be careful with the masking/acking due to the side effects * of masking an interrupt. */ -static void intc_external_irq(unsigned int __irq, struct irq_desc *desc) +static void intc_external_irq(struct irq_desc *desc) { - unsigned int irq = irq_desc_get_irq(desc); - irq_desc_get_chip(desc)->irq_ack(&desc->irq_data); - handle_simple_irq(irq, desc); + handle_simple_irq(desc); } static struct irq_chip intc_irq_chip = { |