aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpiolib-acpi.c
diff options
context:
space:
mode:
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 c3bdaff71c25..c0929d938ced 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -209,7 +209,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
209 209
210 gpiod_direction_input(desc); 210 gpiod_direction_input(desc);
211 211
212 ret = gpio_lock_as_irq(chip, pin); 212 ret = gpiochip_lock_as_irq(chip, pin);
213 if (ret) { 213 if (ret) {
214 dev_err(chip->dev, "Failed to lock GPIO as interrupt\n"); 214 dev_err(chip->dev, "Failed to lock GPIO as interrupt\n");
215 goto fail_free_desc; 215 goto fail_free_desc;
@@ -265,7 +265,7 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares,
265fail_free_event: 265fail_free_event:
266 kfree(event); 266 kfree(event);
267fail_unlock_irq: 267fail_unlock_irq:
268 gpio_unlock_as_irq(chip, pin); 268 gpiochip_unlock_as_irq(chip, pin);
269fail_free_desc: 269fail_free_desc:
270 gpiochip_free_own_desc(desc); 270 gpiochip_free_own_desc(desc);
271 271
@@ -336,7 +336,7 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip)
336 desc = event->desc; 336 desc = event->desc;
337 if (WARN_ON(IS_ERR(desc))) 337 if (WARN_ON(IS_ERR(desc)))
338 continue; 338 continue;
339 gpio_unlock_as_irq(chip, event->pin); 339 gpiochip_unlock_as_irq(chip, event->pin);
340 gpiochip_free_own_desc(desc); 340 gpiochip_free_own_desc(desc);
341 list_del(&event->node); 341 list_del(&event->node);
342 kfree(event); 342 kfree(event);