diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-06-16 17:48:22 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-06-16 17:48:22 +0200 |
| commit | c8d9c3674cba2e420f31e64e4f1ec52db5cc0bb5 (patch) | |
| tree | ec6f705d4ce698d38f589355d8c41964c446ba68 /drivers/gpio | |
| parent | 6c8f2df3b5064fa848f365fe6a51861b90b5ce7f (diff) | |
| parent | 23db673d7e5194c8fbbb8c307e23960767305c09 (diff) | |
Merge remote-tracking branch 'linux-pm/acpi-scan' into review-hans
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib-acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index cf99a5752fe0..411525ac4cc4 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -1284,14 +1284,14 @@ static void acpi_gpiochip_scan_gpios(struct acpi_gpio_chip *achip) void acpi_gpiochip_add(struct gpio_chip *chip) { struct acpi_gpio_chip *acpi_gpio; - acpi_handle handle; + struct acpi_device *adev; acpi_status status; if (!chip || !chip->parent) return; - handle = ACPI_HANDLE(chip->parent); - if (!handle) + adev = ACPI_COMPANION(chip->parent); + if (!adev) return; acpi_gpio = kzalloc(sizeof(*acpi_gpio), GFP_KERNEL); @@ -1305,7 +1305,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip) INIT_LIST_HEAD(&acpi_gpio->events); INIT_LIST_HEAD(&acpi_gpio->deferred_req_irqs_list_entry); - status = acpi_attach_data(handle, acpi_gpio_chip_dh, acpi_gpio); + status = acpi_attach_data(adev->handle, acpi_gpio_chip_dh, acpi_gpio); if (ACPI_FAILURE(status)) { dev_err(chip->parent, "Failed to attach ACPI GPIO chip\n"); kfree(acpi_gpio); @@ -1314,7 +1314,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip) acpi_gpiochip_request_regions(acpi_gpio); acpi_gpiochip_scan_gpios(acpi_gpio); - acpi_walk_dep_device_list(handle); + acpi_dev_clear_dependencies(adev); } void acpi_gpiochip_remove(struct gpio_chip *chip) |