Skip to contentSkip to conversation

fujitsu-laptop: acpi_fujitsu_bl_notify() cleanup

PATCH In review Michał Kępień 3 participants 6 messages Mar 1, 2017 – Mar 13, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover fujitsu-laptop: acpi_fujitsu_bl_notify() cleanup

Here are two minor cleanups for acpi_fujitsu_bl_notify() that I came up with while preparing the sparse keymap migration.

Changes from v1:

- Rebase on top of reworked Alan Jenkins' cleanup patch series.

- Join integer variable declarations into a single line in patch 2/2.

 drivers/platform/x86/fujitsu-laptop.c | 64 +++++++++++++++--------------------
 1 file changed, 28 insertions(+), 36 deletions(-)
Signature · 1 line
2.12.0
#1 lore raw

PATCH v2 1/2 platform/x86: fujitsu-laptop: decrease indentation in acpi_fujitsu_bl_notify()

acpi_fujitsu_bl_notify() is pretty deeply nested, which hurts readability. Strip off one level of indentation by returning early when the event code supplied as argument is not ACPI_FUJITSU_NOTIFY_CODE1.

---
Changes introduced by this patch are best viewed when whitespace changes are ignored.

 drivers/platform/x86/fujitsu-laptop.c | 64 ++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 31 deletions(-)
drivers/platform/x86/fujitsu-laptop.c +33 -31
index e12cc3504d48..b19f6e1c0173 100644
@@ -795,40 +795,42 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
 
 	input = fujitsu_bl->input;
 
-	switch (event) {
-	case ACPI_FUJITSU_NOTIFY_CODE1:
-		keycode = 0;
-		oldb = fujitsu_bl->brightness_level;
-		get_lcd_level();
-		newb = fujitsu_bl->brightness_level;
-
-		vdbg_printk(FUJLAPTOP_DBG_TRACE,
-			    "brightness button event [%i -> %i (%i)]\n",
-			    oldb, newb, fujitsu_bl->brightness_changed);
-
-		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_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;
-		}
-		break;
-	default:
+	if (event != ACPI_FUJITSU_NOTIFY_CODE1) {
 		keycode = KEY_UNKNOWN;
 		vdbg_printk(FUJLAPTOP_DBG_WARN,
 			    "unsupported event [0x%x]\n", event);
-		break;
+		input_report_key(input, keycode, 1);
+		input_sync(input);
+		input_report_key(input, keycode, 0);
+		input_sync(input);
+		return;
+	}
+
+	keycode = 0;
+	oldb = fujitsu_bl->brightness_level;
+	get_lcd_level();
+	newb = fujitsu_bl->brightness_level;
+
+	vdbg_printk(FUJLAPTOP_DBG_TRACE,
+		    "brightness button event [%i -> %i (%i)]\n",
+		    oldb, newb, fujitsu_bl->brightness_changed);
+
+	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_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) {
Signature · 1 line
2.12.0
#2 lore raw

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

In reply to Michał Kępień

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.

---
 drivers/platform/x86/fujitsu-laptop.c | 40 +++++++++++++----------------------
 1 file changed, 15 insertions(+), 25 deletions(-)
drivers/platform/x86/fujitsu-laptop.c +15 -25
index b19f6e1c0173..4a5e7b60a672 100644
@@ -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)
 {
 	struct input_dev *input;
-	int keycode;
-	int oldb, newb;
+	int oldb, newb, keycode;
 
 	input = fujitsu_bl->input;
 
@@ -806,7 +805,6 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
 		return;
 	}
 
-	keycode = 0;
 	oldb = fujitsu_bl->brightness_level;
 	get_lcd_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",
 		    oldb, newb, fujitsu_bl->brightness_changed);
 
-	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_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 (oldb == newb)
+		return;
 
-	if (keycode != 0) {
-		input_report_key(input, keycode, 1);
-		input_sync(input);
-		input_report_key(input, keycode, 0);
-		input_sync(input);
+	if (disable_brightness_adjust != 1) {
+		if (use_alt_lcd_levels)
+			set_lcd_level_alt(newb);
+		else
+			set_lcd_level(newb);
 	}
+
+	keycode = oldb < newb ? KEY_BRIGHTNESSUP : KEY_BRIGHTNESSDOWN;
+
+	input_report_key(input, keycode, 1);
+	input_sync(input);
+	input_report_key(input, keycode, 0);
+	input_sync(input);
 }
 
 /* ACPI device for hotkey handling */
Signature · 1 line
2.12.0
maintainer
#3 lore raw
In reply to Michał Kępień
Quoted 2 lines · Micha?? K??pie??

Here are two minor cleanups for acpi_fujitsu_bl_notify() that I came up with while preparing the sparse keymap migration.

These both look innoculous at first glance. I will review them and test on hardware within the next 48 hours.

Regards
jonathan

maintainer Tested-by Reviewed-by on the v2 series
#4 lore raw
In reply to Michał Kępień
Quoted 11 lines · Micha?? K??pie??

Here are two minor cleanups for acpi_fujitsu_bl_notify() that I came up with while preparing the sparse keymap migration.

Changes from v1:

- Rebase on top of reworked Alan Jenkins' cleanup patch series.

- Join integer variable declarations into a single line in patch 2/2.

 drivers/platform/x86/fujitsu-laptop.c | 64 +++++++++++++++--------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

These two clean ups, as their descriptions indicate, improve the clarity of the driver code and permit some minor optimisations. No regressions are evident when tested on S7020 hardware. Please apply.

Regards
jonathan

#5 lore raw
Quoted 13 lines · Jonathan Woithe
Quoted 11 lines · Micha?? K??pie??

Here are two minor cleanups for acpi_fujitsu_bl_notify() that I came up with while preparing the sparse keymap migration.

Changes from v1:

- Rebase on top of reworked Alan Jenkins' cleanup patch series.

- Join integer variable declarations into a single line in patch 2/2.

 drivers/platform/x86/fujitsu-laptop.c | 64 +++++++++++++++--------------------
 1 file changed, 28 insertions(+), 36 deletions(-)
Quoted 6 lines

These two clean ups, as their descriptions indicate, improve the clarity of the driver code and permit some minor optimisations. No regressions are evident when tested on S7020 hardware. Please apply.

Pushed to testing, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko