gpio: Fix further merge errors

The previous merge of v5.3-rc7 was struggle enough, now it
gave rise to new errors and now I fix those too.

Fixes: 151a41014bff ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5b351f87c50a6db29ddd8ecc354c49c71812940f..56d0898d94aa44094ba942df19268295ea925283 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1399,12 +1399,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
 
        machine_gpiochip_add(chip);
 
-       status = gpiochip_irqchip_init_valid_mask(chip);
-       if (status)
+       ret = gpiochip_irqchip_init_valid_mask(chip);
+       if (ret)
                goto err_remove_acpi_chip;
 
-       status = gpiochip_add_irqchip(chip, lock_key, request_key);
-       if (status)
+       ret = gpiochip_add_irqchip(chip, lock_key, request_key);
+       if (ret)
                goto err_remove_irqchip_mask;
 
        /*