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/platform/surface/aggregator | |
| parent | 6c8f2df3b5064fa848f365fe6a51861b90b5ce7f (diff) | |
| parent | 23db673d7e5194c8fbbb8c307e23960767305c09 (diff) | |
| download | lwn-c8d9c3674cba2e420f31e64e4f1ec52db5cc0bb5.tar.gz lwn-c8d9c3674cba2e420f31e64e4f1ec52db5cc0bb5.zip | |
Merge remote-tracking branch 'linux-pm/acpi-scan' into review-hans
Diffstat (limited to 'drivers/platform/surface/aggregator')
| -rw-r--r-- | drivers/platform/surface/aggregator/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/surface/aggregator/core.c b/drivers/platform/surface/aggregator/core.c index 5d780e55f4a1..279d9df19c01 100644 --- a/drivers/platform/surface/aggregator/core.c +++ b/drivers/platform/surface/aggregator/core.c @@ -621,8 +621,8 @@ static const struct acpi_gpio_mapping ssam_acpi_gpios[] = { static int ssam_serial_hub_probe(struct serdev_device *serdev) { + struct acpi_device *ssh = ACPI_COMPANION(&serdev->dev); struct ssam_controller *ctrl; - acpi_handle *ssh = ACPI_HANDLE(&serdev->dev); acpi_status astatus; int status; @@ -652,7 +652,7 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) if (status) goto err_devopen; - astatus = ssam_serdev_setup_via_acpi(ssh, serdev); + astatus = ssam_serdev_setup_via_acpi(ssh->handle, serdev); if (ACPI_FAILURE(astatus)) { status = -ENXIO; goto err_devinit; @@ -706,7 +706,7 @@ static int ssam_serial_hub_probe(struct serdev_device *serdev) * For now let's thus default power/wakeup to false. */ device_set_wakeup_capable(&serdev->dev, true); - acpi_walk_dep_device_list(ssh); + acpi_dev_clear_dependencies(ssh); return 0; |