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

gpio: thunderx: Use the default parent apis for {request,release}_resources 

thunderx_gpio_irq_{request,release}_resources apis are trying to
{request,release} resources on parent interrupt. There are default
apis doing the same. Use the default parent apis instead of writing
the same code snippet.

Cc: linux-gpio@vger.kernel.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Lokesh Vutla 2019-04-30 15:42:23 +05:30 committed by Marc Zyngier
parent 2bd1298ac1
commit 0d04d0c146
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpio/gpio-thunderx.c
View File

@ -363,22 +363,16 @@ static int thunderx_gpio_irq_request_resources(struct irq_data *data)
{ {
struct thunderx_line *txline = irq_data_get_irq_chip_data(data); struct thunderx_line *txline = irq_data_get_irq_chip_data(data);
struct thunderx_gpio *txgpio = txline->txgpio; struct thunderx_gpio *txgpio = txline->txgpio;
struct irq_data *parent_data = data->parent_data;
int r; int r;
r = gpiochip_lock_as_irq(&txgpio->chip, txline->line); r = gpiochip_lock_as_irq(&txgpio->chip, txline->line);
if (r) if (r)
return r; return r;
if (parent_data && parent_data->chip->irq_request_resources) { r = irq_chip_request_resources_parent(data);
r = parent_data->chip->irq_request_resources(parent_data); if (r)
if (r) gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
goto error;
}
return 0;
error:
gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
return r; return r;
} }
@ -386,10 +380,8 @@ static void thunderx_gpio_irq_release_resources(struct irq_data *data)
{ {
struct thunderx_line *txline = irq_data_get_irq_chip_data(data); struct thunderx_line *txline = irq_data_get_irq_chip_data(data);
struct thunderx_gpio *txgpio = txline->txgpio; struct thunderx_gpio *txgpio = txline->txgpio;
struct irq_data *parent_data = data->parent_data;
if (parent_data && parent_data->chip->irq_release_resources) irq_chip_release_resources_parent(data);
parent_data->chip->irq_release_resources(parent_data);
gpiochip_unlock_as_irq(&txgpio->chip, txline->line); gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
} }