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/pinctrl/pinctrl-st.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/pinctrl/pinctrl-st.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-st.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c index f8338d2e6b6b..389526e704fb 100644 --- a/drivers/pinctrl/pinctrl-st.c +++ b/drivers/pinctrl/pinctrl-st.c @@ -1460,7 +1460,7 @@ static void __gpio_irq_handler(struct st_gpio_bank *bank) } } -static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc) +static void st_gpio_irq_handler(struct irq_desc *desc) { /* interrupt dedicated per bank */ struct irq_chip *chip = irq_desc_get_chip(desc); @@ -1472,7 +1472,7 @@ static void st_gpio_irq_handler(unsigned irq, struct irq_desc *desc) chained_irq_exit(chip, desc); } -static void st_gpio_irqmux_handler(unsigned irq, struct irq_desc *desc) +static void st_gpio_irqmux_handler(struct irq_desc *desc) { struct irq_chip *chip = irq_desc_get_chip(desc); struct st_pinctrl *info = irq_desc_get_handler_data(desc); |