Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77c39851 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

intel-smartconnect: convert acpi_evaluate_object() to acpi_execute_simple_method()



acpi_execute_simple_method() is a new ACPI API introduced to invoke
an ACPI control method that has single integer parameter and no return value.

Convert acpi_evaluate_object() to acpi_execute_simple_method()
in drivers/platform/x86/intel-smartconnect.c

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b92f7a9f
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -25,10 +25,8 @@ MODULE_LICENSE("GPL");

static int smartconnect_acpi_init(struct acpi_device *acpi)
{
	struct acpi_object_list input;
	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
	union acpi_object *result;
	union acpi_object param;
	acpi_status status;

	status = acpi_evaluate_object(acpi->handle, "GAOS", NULL, &output);
@@ -43,15 +41,8 @@ static int smartconnect_acpi_init(struct acpi_device *acpi)
	}

	if (result->integer.value & 0x1) {
		param.type = ACPI_TYPE_INTEGER;
		param.integer.value = 0;

		input.count = 1;
		input.pointer = &param;

		dev_info(&acpi->dev, "Disabling Intel Smart Connect\n");
		status = acpi_evaluate_object(acpi->handle, "SAOS", &input,
					      NULL);
		status = acpi_execute_simple_method(acpi->handle, "SAOS", 0);
	}

	kfree(result);