OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

platform/x86: fujitsu-laptop: merge set_lcd_level_alt() into set_lcd_level()

Browse Source 
Depending on the value of the use_alt_lcd_levels module parameter, one
of two functions is used for setting LCD brightness level.  These
functions are almost identical and only differ in the name of the ACPI
method they call.  Instead of checking the value of use_alt_lcd_levels
at each call site, move that check to set_lcd_level() and get rid of
set_lcd_level_alt().

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Michał Kępień 2017-04-05 08:49:02 +02:00 committed by Darren Hart (VMware)
parent a1aabd5f36
commit e32c50ba5a
1 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/platform/x86/fujitsu-laptop.c
View File

@ -345,41 +345,26 @@ static int set_lcd_level(int level)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
acpi_handle handle = NULL; acpi_handle handle = NULL;
char *method;
vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBLL [%d]\n", switch (use_alt_lcd_levels) {
level); case 1:
method = "SBL2";
if (level < 0 || level >= fujitsu_bl->max_brightness) break;
return -EINVAL; default:
method = "SBLL";
status = acpi_get_handle(fujitsu_bl->acpi_handle, "SBLL", &handle); break;
if (ACPI_FAILURE(status)) {
vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBLL not present\n");
return -ENODEV;
} }
vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via %s [%d]\n",
status = acpi_execute_simple_method(handle, NULL, level); method, level);
if (ACPI_FAILURE(status))
return -ENODEV;
return 0;
}
static int set_lcd_level_alt(int level)
{
acpi_status status = AE_OK;
acpi_handle handle = NULL;
vdbg_printk(FUJLAPTOP_DBG_TRACE, "set lcd level via SBL2 [%d]\n",
level);
if (level < 0 || level >= fujitsu_bl->max_brightness) if (level < 0 || level >= fujitsu_bl->max_brightness)
return -EINVAL; return -EINVAL;
status = acpi_get_handle(fujitsu_bl->acpi_handle, "SBL2", &handle); status = acpi_get_handle(fujitsu_bl->acpi_handle, method, &handle);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBL2 not present\n"); vdbg_printk(FUJLAPTOP_DBG_ERROR, "%s not present\n", method);
return -ENODEV; return -ENODEV;
} }
@ -448,10 +433,7 @@ static int bl_update_status(struct backlight_device *b)
"Unable to adjust backlight power, error code %i\n", "Unable to adjust backlight power, error code %i\n",
ret); ret);
if (use_alt_lcd_levels) ret = set_lcd_level(b->props.brightness);
ret = set_lcd_level_alt(b->props.brightness);
else
ret = set_lcd_level(b->props.brightness);
if (ret != 0) if (ret != 0)
vdbg_printk(FUJLAPTOP_DBG_ERROR, vdbg_printk(FUJLAPTOP_DBG_ERROR,
"Unable to adjust LCD brightness, error code %i\n", "Unable to adjust LCD brightness, error code %i\n",
@ -664,12 +646,8 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
if (oldb == newb) if (oldb == newb)
return; return;
if (disable_brightness_adjust != 1) { if (disable_brightness_adjust != 1)
if (use_alt_lcd_levels) set_lcd_level(newb);
set_lcd_level_alt(newb);
else
set_lcd_level(newb);
}
sparse_keymap_report_event(input, oldb < newb, 1, true); sparse_keymap_report_event(input, oldb < newb, 1, true);
} }