leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platform/x86: fujitsu-laptop: simplify brightness key event generation logic

Browse Source 
Returning early when there is no brightness change allows removal of a
duplicate code block, makes the purpose of the following code clearer
and allows the condition surrounding key event generation to be removed.
Local integer variables can also be declared in a single line.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-and-tested-by: Jonathan Woithe <jwoithe@just42.net>
This commit is contained in:
Michał Kępień
2017-03-01 07:42:54 +01:00
committed by Darren Hart
parent 5efc800463
commit d2aa3ae86d
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -790,8 +790,7 @@ static int acpi_fujitsu_bl_remove(struct acpi_device *device)
static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
{ {
struct input_dev *input; struct input_dev *input;
int keycode; int oldb, newb, keycode;
int oldb, newb;
input = fujitsu_bl->input; input = fujitsu_bl->input;
@@ -806,7 +805,6 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
return; return;
} }
keycode = 0;
oldb = fujitsu_bl->brightness_level; oldb = fujitsu_bl->brightness_level;
get_lcd_level(); get_lcd_level();
newb = fujitsu_bl->brightness_level; newb = fujitsu_bl->brightness_level;
@@ -815,30 +813,22 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
"brightness button event [%i -> %i (%i)]\n", "brightness button event [%i -> %i (%i)]\n",
oldb, newb, fujitsu_bl->brightness_changed); oldb, newb, fujitsu_bl->brightness_changed);
if (oldb < newb) { if (oldb == newb)
return;
if (disable_brightness_adjust != 1) { if (disable_brightness_adjust != 1) {
if (use_alt_lcd_levels) if (use_alt_lcd_levels)
set_lcd_level_alt(newb); set_lcd_level_alt(newb);
else else
set_lcd_level(newb); set_lcd_level(newb);
} }
keycode = KEY_BRIGHTNESSUP;
} else if (oldb > newb) {
if (disable_brightness_adjust != 1) {
if (use_alt_lcd_levels)
set_lcd_level_alt(newb);
else
set_lcd_level(newb);
}
keycode = KEY_BRIGHTNESSDOWN;
}
if (keycode != 0) { keycode = oldb < newb ? KEY_BRIGHTNESSUP : KEY_BRIGHTNESSDOWN;
input_report_key(input, keycode, 1); input_report_key(input, keycode, 1);
input_sync(input); input_sync(input);
input_report_key(input, keycode, 0); input_report_key(input, keycode, 0);
input_sync(input); input_sync(input);
}
} }
/* ACPI device for hotkey handling */ /* ACPI device for hotkey handling */