1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
index 1306722faa5a..715371b5102a 100644
--- a/drivers/gpio/gpio-thunderx.c
+++ b/drivers/gpio/gpio-thunderx.c
@@ -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_gpio *txgpio = txline->txgpio;
-        struct irq_data *parent_data = data->parent_data;
         int r;
 
         r = gpiochip_lock_as_irq(&txgpio->chip, txline->line);
         if (r)
                 return r;
 
-        if (parent_data && parent_data->chip->irq_request_resources) {
-                r = parent_data->chip->irq_request_resources(parent_data);
-                if (r)
-                        goto error;
-        }
+        r = irq_chip_request_resources_parent(data);
+        if (r)
+                gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
 
-        return 0;
-error:
-        gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
         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_gpio *txgpio = txline->txgpio;
-        struct irq_data *parent_data = data->parent_data;
 
-        if (parent_data && parent_data->chip->irq_release_resources)
-                parent_data->chip->irq_release_resources(parent_data);
+        irq_chip_release_resources_parent(data);
 
         gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
 }