Commit 6768bddb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Hans de Goede
Browse files

platform/surface: Replace acpi_bus_get_device() 



Replace acpi_bus_get_device() that is going to be dropped with
acpi_fetch_acpi_dev().

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarMaximilian Luz <luzmaximilian@gmail.com>
Link: https://lore.kernel.org/r/5805278.lOV4Wx5bFT@kreacher


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent f7e62c58

drivers/platform/surface/surface3-wmi.c

+4 −8
Original line number Diff line number Diff line
@@ -116,14 +116,10 @@ static acpi_status s3_wmi_attach_spi_device(acpi_handle handle, 
					    void *data,

					    void **return_value)

{

	struct acpi_device *adev, **ts_adev;

	struct acpi_device *adev = acpi_fetch_acpi_dev(handle);

	struct acpi_device **ts_adev = data;



	if (acpi_bus_get_device(handle, &adev))

		return AE_OK;



	ts_adev = data;



	if (strncmp(acpi_device_bid(adev), SPI_TS_OBJ_NAME,

	if (!adev || strncmp(acpi_device_bid(adev), SPI_TS_OBJ_NAME,

			     strlen(SPI_TS_OBJ_NAME)))

		return AE_OK;

drivers/platform/surface/surface_acpi_notify.c

+2 −1
Original line number Diff line number Diff line
@@ -770,7 +770,8 @@ static acpi_status san_consumer_setup(acpi_handle handle, u32 lvl, 
		return AE_OK;



	/* Ignore ACPI devices that are not present. */

	if (acpi_bus_get_device(handle, &adev) != 0)

	adev = acpi_fetch_acpi_dev(handle);

	if (!adev)

		return AE_OK;



	san_consumer_dbg(&pdev->dev, handle, "creating device link\n");