aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpiolib-acpi.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-10-23 04:27:07 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-10-28 12:30:59 -0400
commite3a2e87893125bcd99bd7e1ddf9bfc421e492572 (patch)
tree725e03df58827c8eca35ffb787f43921c55046b2 /drivers/gpio/gpiolib-acpi.c
parentee2a9f7f06a5bff86cf3468fe74bf504640cf5e6 (diff)
gpio: rename gpio_lock_as_irq to gpiochip_lock_as_irq
This function actually operates on a gpio_chip, so its prefix should reflect that fact for consistency with other functions defined in gpio/driver.h. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpiolib-acpi.c')
-rw-r--r--drivers/gpio/gpiolib-acpi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 05c6275da224..349a7552dd23 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -153,7 +153,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
153 153
154 gpiod_direction_input(desc); 154 gpiod_direction_input(desc);
155 155
156 ret = gpio_lock_as_irq(chip, pin); 156 ret = gpiochip_lock_as_irq(chip, pin);
157 if (ret) { 157 if (ret) {
158 dev_err(chip->dev, "Failed to lock GPIO as interrupt\n"); 158 dev_err(chip->dev, "Failed to lock GPIO as interrupt\n");
159 goto fail_free_desc; 159 goto fail_free_desc;
@@ -209,7 +209,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
209fail_free_event: 209fail_free_event:
210 kfree(event); 210 kfree(event);
211fail_unlock_irq: 211fail_unlock_irq:
212 gpio_unlock_as_irq(chip, pin); 212 gpiochip_unlock_as_irq(chip, pin);
213fail_free_desc: 213fail_free_desc:
214 gpiochip_free_own_desc(desc); 214 gpiochip_free_own_desc(desc);
215 215
@@ -280,7 +280,7 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip)
280 desc = event->desc; 280 desc = event->desc;
281 if (WARN_ON(IS_ERR(desc))) 281 if (WARN_ON(IS_ERR(desc)))
282 continue; 282 continue;
283 gpio_unlock_as_irq(chip, event->pin); 283 gpiochip_unlock_as_irq(chip, event->pin);
284 gpiochip_free_own_desc(desc); 284 gpiochip_free_own_desc(desc);
285 list_del(&event->node); 285 list_del(&event->node);
286 kfree(event); 286 kfree(event);