Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / platform / surface / surface3_power.c

diff --git a/drivers/platform/surface/surface3_power.c b/drivers/platform/surface/surface3_power.c
index cc4f9cba68563c137c1c71785e8d6c26479ef2c6..dea82aa1abd489acf49717aee3bc4a0442a02653 100644 (file)
--- a/drivers/platform/surface/surface3_power.c
+++ b/drivers/platform/surface/surface3_power.c
@@ -446,12 +446,12 @@ mshw0011_space_handler(u32 function, acpi_physical_address command,
 
 static int mshw0011_install_space_handler(struct i2c_client *client)
 {
-       acpi_handle handle;
+       struct acpi_device *adev;
        struct mshw0011_handler_data *data;
        acpi_status status;
 
-       handle = ACPI_HANDLE(&client->dev);
-       if (!handle)
+       adev = ACPI_COMPANION(&client->dev);
+       if (!adev)
                return -ENODEV;
 
        data = kzalloc(sizeof(struct mshw0011_handler_data),
@@ -460,25 +460,25 @@ static int mshw0011_install_space_handler(struct i2c_client *client)
                return -ENOMEM;
 
        data->client = client;
-       status = acpi_bus_attach_private_data(handle, (void *)data);
+       status = acpi_bus_attach_private_data(adev->handle, (void *)data);
        if (ACPI_FAILURE(status)) {
                kfree(data);
                return -ENOMEM;
        }
 
-       status = acpi_install_address_space_handler(handle,
-                               ACPI_ADR_SPACE_GSBUS,
-                               &mshw0011_space_handler,
-                               NULL,
-                               data);
+       status = acpi_install_address_space_handler(adev->handle,
+                                                   ACPI_ADR_SPACE_GSBUS,
+                                                   &mshw0011_space_handler,
+                                                   NULL,
+                                                   data);
        if (ACPI_FAILURE(status)) {
                dev_err(&client->dev, "Error installing i2c space handler\n");
-               acpi_bus_detach_private_data(handle);
+               acpi_bus_detach_private_data(adev->handle);
                kfree(data);
                return -ENOMEM;
        }
 
-       acpi_walk_dep_device_list(handle);
+       acpi_dev_clear_dependencies(adev);
        return 0;
 }