UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: st: switch IRQ locking to resource callbacks 

In the mass-conversion to the new irqchip callbacks, this
in-transit IRQ support was missed. Fix it.

Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Cc: Maxime COQUELIN <maxime.coquelin@st.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-04-04 16:02:21 +02:00
parent a798c10faf
commit c15c0d160c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pinctrl/pinctrl-st.c
View File

@ -1312,25 +1312,23 @@ static void st_gpio_irq_unmask(struct irq_data *d)
writel(BIT(d->hwirq), bank->base + REG_PIO_SET_PMASK); writel(BIT(d->hwirq), bank->base + REG_PIO_SET_PMASK);
} }
static unsigned int st_gpio_irq_startup(struct irq_data *d) static int st_gpio_irq_reqres(struct irq_data *d)
{ {
struct st_gpio_bank *bank = irq_data_get_irq_chip_data(d); struct st_gpio_bank *bank = irq_data_get_irq_chip_data(d);
if (gpio_lock_as_irq(&bank->gpio_chip, d->hwirq)) if (gpio_lock_as_irq(&bank->gpio_chip, d->hwirq)) {
dev_err(bank->gpio_chip.dev, dev_err(bank->gpio_chip.dev,
"unable to lock HW IRQ %lu for IRQ\n", "unable to lock HW IRQ %lu for IRQ\n",
d->hwirq); d->hwirq);
return -EINVAL;
st_gpio_irq_unmask(d); }
return 0; return 0;
} }
static void st_gpio_irq_shutdown(struct irq_data *d) static void st_gpio_irq_relres(struct irq_data *d)
{ {
struct st_gpio_bank *bank = irq_data_get_irq_chip_data(d); struct st_gpio_bank *bank = irq_data_get_irq_chip_data(d);
st_gpio_irq_mask(d);
gpio_unlock_as_irq(&bank->gpio_chip, d->hwirq); gpio_unlock_as_irq(&bank->gpio_chip, d->hwirq);
} }
@ -1491,8 +1489,8 @@ static struct irq_chip st_gpio_irqchip = {
.irq_mask = st_gpio_irq_mask, .irq_mask = st_gpio_irq_mask,
.irq_unmask = st_gpio_irq_unmask, .irq_unmask = st_gpio_irq_unmask,
.irq_set_type = st_gpio_irq_set_type, .irq_set_type = st_gpio_irq_set_type,
.irq_startup = st_gpio_irq_startup, .irq_request_resources = st_gpio_irq_reqres,
.irq_shutdown = st_gpio_irq_shutdown, .irq_release_resources = st_gpio_irq_relres,
}; };
static int st_gpio_irq_domain_map(struct irq_domain *h, static int st_gpio_irq_domain_map(struct irq_domain *h,