diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-at91.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-at91.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 38c6f8b9790e..d990e33d8aa7 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c | |||
@@ -1286,22 +1286,22 @@ static int alt_gpio_irq_type(struct irq_data *d, unsigned type) | |||
1286 | 1286 | ||
1287 | switch (type) { | 1287 | switch (type) { |
1288 | case IRQ_TYPE_EDGE_RISING: | 1288 | case IRQ_TYPE_EDGE_RISING: |
1289 | irq_set_handler(d->irq, handle_simple_irq); | 1289 | __irq_set_handler_locked(d->irq, handle_simple_irq); |
1290 | writel_relaxed(mask, pio + PIO_ESR); | 1290 | writel_relaxed(mask, pio + PIO_ESR); |
1291 | writel_relaxed(mask, pio + PIO_REHLSR); | 1291 | writel_relaxed(mask, pio + PIO_REHLSR); |
1292 | break; | 1292 | break; |
1293 | case IRQ_TYPE_EDGE_FALLING: | 1293 | case IRQ_TYPE_EDGE_FALLING: |
1294 | irq_set_handler(d->irq, handle_simple_irq); | 1294 | __irq_set_handler_locked(d->irq, handle_simple_irq); |
1295 | writel_relaxed(mask, pio + PIO_ESR); | 1295 | writel_relaxed(mask, pio + PIO_ESR); |
1296 | writel_relaxed(mask, pio + PIO_FELLSR); | 1296 | writel_relaxed(mask, pio + PIO_FELLSR); |
1297 | break; | 1297 | break; |
1298 | case IRQ_TYPE_LEVEL_LOW: | 1298 | case IRQ_TYPE_LEVEL_LOW: |
1299 | irq_set_handler(d->irq, handle_level_irq); | 1299 | __irq_set_handler_locked(d->irq, handle_level_irq); |
1300 | writel_relaxed(mask, pio + PIO_LSR); | 1300 | writel_relaxed(mask, pio + PIO_LSR); |
1301 | writel_relaxed(mask, pio + PIO_FELLSR); | 1301 | writel_relaxed(mask, pio + PIO_FELLSR); |
1302 | break; | 1302 | break; |
1303 | case IRQ_TYPE_LEVEL_HIGH: | 1303 | case IRQ_TYPE_LEVEL_HIGH: |
1304 | irq_set_handler(d->irq, handle_level_irq); | 1304 | __irq_set_handler_locked(d->irq, handle_level_irq); |
1305 | writel_relaxed(mask, pio + PIO_LSR); | 1305 | writel_relaxed(mask, pio + PIO_LSR); |
1306 | writel_relaxed(mask, pio + PIO_REHLSR); | 1306 | writel_relaxed(mask, pio + PIO_REHLSR); |
1307 | break; | 1307 | break; |
@@ -1310,7 +1310,7 @@ static int alt_gpio_irq_type(struct irq_data *d, unsigned type) | |||
1310 | * disable additional interrupt modes: | 1310 | * disable additional interrupt modes: |
1311 | * fall back to default behavior | 1311 | * fall back to default behavior |
1312 | */ | 1312 | */ |
1313 | irq_set_handler(d->irq, handle_simple_irq); | 1313 | __irq_set_handler_locked(d->irq, handle_simple_irq); |
1314 | writel_relaxed(mask, pio + PIO_AIMDR); | 1314 | writel_relaxed(mask, pio + PIO_AIMDR); |
1315 | return 0; | 1315 | return 0; |
1316 | case IRQ_TYPE_NONE: | 1316 | case IRQ_TYPE_NONE: |