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

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

intel-rst: 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-rst.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 6c7fe47a

drivers/platform/x86/intel-rst.c

+2 −18
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ static ssize_t irst_store_wakeup_events(struct device *dev, 
					const char *buf, size_t count)

{

	struct acpi_device *acpi;

	struct acpi_object_list input;

	union acpi_object param;

	acpi_status status;

	unsigned long value;

	int error;
@@ -67,13 +65,7 @@ static ssize_t irst_store_wakeup_events(struct device *dev, 
	if (error)

		return error;



	param.type = ACPI_TYPE_INTEGER;

	param.integer.value = value;



	input.count = 1;

	input.pointer = &param;



	status = acpi_evaluate_object(acpi->handle, "SFFS", &input, NULL);

	status = acpi_execute_simple_method(acpi->handle, "SFFS", value);



	if (!ACPI_SUCCESS(status))

		return -EINVAL;
@@ -116,8 +108,6 @@ static ssize_t irst_store_wakeup_time(struct device *dev, 
				      const char *buf, size_t count)

{

	struct acpi_device *acpi;

	struct acpi_object_list input;

	union acpi_object param;

	acpi_status status;

	unsigned long value;

	int error;
@@ -129,13 +119,7 @@ static ssize_t irst_store_wakeup_time(struct device *dev, 
	if (error)

		return error;



	param.type = ACPI_TYPE_INTEGER;

	param.integer.value = value;



	input.count = 1;

	input.pointer = &param;



	status = acpi_evaluate_object(acpi->handle, "SFTV", &input, NULL);

	status = acpi_execute_simple_method(acpi->handle, "SFTV", value);



	if (!ACPI_SUCCESS(status))

		return -EINVAL;