Commit ff4865b3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Takashi Iwai
Browse files

ALSA: 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>
Link: https://lore.kernel.org/r/2828205.e9J7NaK4W3@kreacher


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 94db9cc8

sound/hda/intel-sdw-acpi.c

+3 −4
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ static bool is_link_enabled(struct fwnode_handle *fw_node, int i) 
static int

sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)

{

	struct acpi_device *adev;

	struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle);

	int ret, i;

	u8 count;



	if (acpi_bus_get_device(info->handle, &adev))

	if (!adev)

		return -EINVAL;



	/* Found controller, find links supported */
@@ -119,7 +119,6 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
				     void *cdata, void **return_value)

{

	struct sdw_intel_acpi_info *info = cdata;

	struct acpi_device *adev;

	acpi_status status;

	u64 adr;
@@ -127,7 +126,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
	if (ACPI_FAILURE(status))

		return AE_OK; /* keep going */



	if (acpi_bus_get_device(handle, &adev)) {

	if (!acpi_fetch_acpi_dev(handle)) {

		pr_err("%s: Couldn't find ACPI handle\n", __func__);

		return AE_NOT_FOUND;

	}

sound/soc/soc-acpi.c

+2 −5
Original line number Diff line number Diff line
@@ -55,16 +55,13 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_find_machine); 
static acpi_status snd_soc_acpi_find_package(acpi_handle handle, u32 level,

					     void *context, void **ret)

{

	struct acpi_device *adev;

	struct acpi_device *adev = acpi_fetch_acpi_dev(handle);

	acpi_status status;

	struct snd_soc_acpi_package_context *pkg_ctx = context;



	pkg_ctx->data_valid = false;



	if (acpi_bus_get_device(handle, &adev))

		return AE_OK;



	if (adev->status.present && adev->status.functional) {

	if (adev && adev->status.present && adev->status.functional) {

		struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};

		union acpi_object  *myobj = NULL;