gpio: change gpiochip_request_own_desc() prototype

The current prototype of gpiochip_request_own_desc() requires to obtain
a pointer to a descriptor. This is in contradiction to all other GPIO
request schemes, and imposes an extra step of obtaining a descriptor to
drivers. Most drivers actually cannot even perform that step since the
function that does it (gpichip_get_desc()) is gpiolib-private.

Change gpiochip_request_own_desc() to return a descriptor from a
(chip, hwnum) tuple and update users of this function (currently
gpiolib-acpi only).

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 3 insertions, 17 deletions

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 84540025aa08..f9103e72e2a4 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -145,14 +145,8 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
         if (!handler)
                 return AE_BAD_PARAMETER;
 
-        desc = gpiochip_get_desc(chip, pin);
+        desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event");
         if (IS_ERR(desc)) {
-                dev_err(chip->dev, "Failed to get GPIO descriptor\n");
-                return AE_ERROR;
-        }
-
-        ret = gpiochip_request_own_desc(desc, "ACPI:Event");
-        if (ret) {
                 dev_err(chip->dev, "Failed to request GPIO\n");
                 return AE_ERROR;
         }
@@ -420,22 +414,14 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                         }
                 }
                 if (!found) {
-                        int ret;
-
-                        desc = gpiochip_get_desc(chip, pin);
+                        desc = gpiochip_request_own_desc(chip, pin,
+                                                         "ACPI:OpRegion");
                         if (IS_ERR(desc)) {
                                 status = AE_ERROR;
                                 mutex_unlock(&achip->conn_lock);
                                 goto out;
                         }
 
-                        ret = gpiochip_request_own_desc(desc, "ACPI:OpRegion");
-                        if (ret) {
-                                status = AE_ERROR;
-                                mutex_unlock(&achip->conn_lock);
-                                goto out;
-                        }
-
                         switch (agpio->io_restriction) {
                         case ACPI_IO_RESTRICT_INPUT:
                                 gpiod_direction_input(desc);