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

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

fujitsu-laptop: 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/fujitsu-laptop.c

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Acked-by: default avatarJonathan Woithe <jwoithe@just42.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent fca41991

drivers/platform/x86/fujitsu-laptop.c

+2 −9
Original line number Diff line number Diff line
@@ -317,8 +317,6 @@ static enum led_brightness kblamps_get(struct led_classdev *cdev) 
static int set_lcd_level(int level)

{

	acpi_status status = AE_OK;

	union acpi_object arg0 = { ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &arg0 };

	acpi_handle handle = NULL;



	vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBLL [%d]\n",
@@ -333,9 +331,8 @@ static int set_lcd_level(int level) 
		return -ENODEV;

	}



	arg0.integer.value = level;



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

	status = acpi_execute_simple_method(handle, NULL, level);

	if (ACPI_FAILURE(status))

		return -ENODEV;
@@ -345,8 +342,6 @@ static int set_lcd_level(int level) 
static int set_lcd_level_alt(int level)

{

	acpi_status status = AE_OK;

	union acpi_object arg0 = { ACPI_TYPE_INTEGER };

	struct acpi_object_list arg_list = { 1, &arg0 };

	acpi_handle handle = NULL;



	vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBL2 [%d]\n",
@@ -361,9 +356,7 @@ static int set_lcd_level_alt(int level) 
		return -ENODEV;

	}



	arg0.integer.value = level;



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

	status = acpi_execute_simple_method(handle, NULL, level);

	if (ACPI_FAILURE(status))

		return -ENODEV;