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

Commit 0db98202 authored by Jiang Liu's avatar Jiang Liu Committed by Rafael J. Wysocki
Browse files

ACPI: introduce helper function acpi_execute_simple_method() 



Introduce helper function acpi_execute_simple_method() and use it in
a number of places to simplify code.

[rjw: Changelog]
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 952c63e9

drivers/acpi/battery.c

+2 −6
Original line number Diff line number Diff line
@@ -525,18 +525,14 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
static int acpi_battery_set_alarm(struct acpi_battery *battery)

{

	acpi_status status = 0;

	union acpi_object arg0 = { .type = ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &arg0 };



	if (!acpi_battery_present(battery) ||

	    !test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags))

		return -ENODEV;



	arg0.integer.value = battery->alarm;



	mutex_lock(&battery->lock);

	status = acpi_evaluate_object(battery->device->handle, "_BTP",

				 &arg_list, NULL);

	status = acpi_execute_simple_method(battery->device->handle, "_BTP",

					    battery->alarm);

	mutex_unlock(&battery->lock);



	if (ACPI_FAILURE(status))

drivers/acpi/bus.c

+1 −5
Original line number Diff line number Diff line
@@ -593,8 +593,6 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) 
static int __init acpi_bus_init_irq(void)

{

	acpi_status status;

	union acpi_object arg = { ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &arg };

	char *message = NULL;
@@ -623,9 +621,7 @@ static int __init acpi_bus_init_irq(void) 


	printk(KERN_INFO PREFIX "Using %s for interrupt routing\n", message);



	arg.integer.value = acpi_irq_model;



	status = acpi_evaluate_object(NULL, "\\_PIC", &arg_list, NULL);

	status = acpi_execute_simple_method(NULL, "\\_PIC", acpi_irq_model);

	if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PIC"));

		return -ENODEV;

drivers/acpi/power.c

+1 −3
Original line number Diff line number Diff line
@@ -637,9 +637,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev, 
	}



	/* Execute _PSW */

	arg_list.count = 1;

	in_arg[0].integer.value = enable;

	status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);

	status = acpi_execute_simple_method(dev->handle, "_PSW", enable);

	if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {

		printk(KERN_ERR PREFIX "_PSW execution failed\n");

		dev->wakeup.flags.valid = 0;

drivers/acpi/sleep.c

+2 −5
Original line number Diff line number Diff line
@@ -31,12 +31,9 @@ static u8 sleep_states[ACPI_S_STATE_COUNT]; 


static void acpi_sleep_tts_switch(u32 acpi_state)

{

	union acpi_object in_arg = { ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &in_arg };

	acpi_status status = AE_OK;

	acpi_status status;



	in_arg.integer.value = acpi_state;

	status = acpi_evaluate_object(NULL, "\\_TTS", &arg_list, NULL);

	status = acpi_execute_simple_method(NULL, "\\_TTS", acpi_state);

	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {

		/*

		 * OS can't evaluate the _TTS object correctly. Some warning

drivers/acpi/thermal.c

+4 −14
Original line number Diff line number Diff line
@@ -239,26 +239,16 @@ static int acpi_thermal_get_polling_frequency(struct acpi_thermal *tz) 


static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)

{

	acpi_status status = AE_OK;

	union acpi_object arg0 = { ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &arg0 };

	acpi_handle handle = NULL;





	if (!tz)

		return -EINVAL;



	status = acpi_get_handle(tz->device->handle, "_SCP", &handle);

	if (ACPI_FAILURE(status)) {

	if (!acpi_has_method(tz->device->handle, "_SCP")) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_SCP not present\n"));

		return -ENODEV;

	}



	arg0.integer.value = mode;



	status = acpi_evaluate_object(handle, NULL, &arg_list, NULL);

	if (ACPI_FAILURE(status))

	} else if (ACPI_FAILURE(acpi_execute_simple_method(tz->device->handle,

							   "_SCP", mode))) {

		return -ENODEV;

	}



	return 0;

}