platform/x86: asus-wmi: Only notify kbd LED hw_change by fn-key pressed

starnight · andy-shev · commit 29f6eb533c3b · 2018-10-31T16:11:40.000+02:00
Since commit dbb3d78 ("platform/x86: asus-wmi: Call led hw_changed API on kbd brightness change"), asus-wmi directly changes the keyboard LED brightness when the keyboard brightness keys are pressed, raising the appropriate notification. However, this notification was unintentionally also being raised during boot and resume from suspend. This was resulting in userspace showing the keyboard LED OSD on resume for no good reason. Move the keyboard LED brightness changed notification from kbd_led_update to the new kbd_led_set_by_kbd function which is only called from the keyboard brightness function keys codepath. Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com> Signed-off-by: Daniel Drake <drake@endlessm.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
@@ -467,7 +467,6 @@ static void kbd_led_update(struct asus_wmi *asus)
 		ctrl_param = 0x80 | (asus->kbd_led_wk & 0x7F);
 
 	asus_wmi_set_devstate(ASUS_WMI_DEVID_KBD_BACKLIGHT, ctrl_param, NULL);
-	led_classdev_notify_brightness_hw_changed(&asus->kbd_led, asus->kbd_led_wk);
 }
 
 static int kbd_led_read(struct asus_wmi *asus, int *level, int *env)
@@ -521,6 +520,14 @@ static void kbd_led_set(struct led_classdev *led_cdev,
 	do_kbd_led_set(led_cdev, value);
 }
 
+static void kbd_led_set_by_kbd(struct asus_wmi *asus, enum led_brightness value)
+{
+	struct led_classdev *led_cdev = &asus->kbd_led;
+
+	do_kbd_led_set(led_cdev, value);
+	led_classdev_notify_brightness_hw_changed(led_cdev, asus->kbd_led_wk);
+}
+
 static enum led_brightness kbd_led_get(struct led_classdev *led_cdev)
 {
 	struct asus_wmi *asus;
@@ -1759,18 +1766,18 @@ static void asus_wmi_notify(u32 value, void *context)
 	}
 
 	if (code == NOTIFY_KBD_BRTUP) {
-		do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk + 1);
+		kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1);
 		goto exit;
 	}
 	if (code == NOTIFY_KBD_BRTDWN) {
-		do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk - 1);
+		kbd_led_set_by_kbd(asus, asus->kbd_led_wk - 1);
 		goto exit;
 	}
 	if (code == NOTIFY_KBD_BRTTOGGLE) {
 		if (asus->kbd_led_wk == asus->kbd_led.max_brightness)
-			do_kbd_led_set(&asus->kbd_led, 0);
+			kbd_led_set_by_kbd(asus, 0);
 		else
-			do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk + 1);
+			kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1);
 		goto exit;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,6 @@ static void kbd_led_update(struct asus_wmi *asus)`
`467`	`467`	`ctrl_param = 0x80 \| (asus->kbd_led_wk & 0x7F);`
`468`	`468`
`469`	`469`	`asus_wmi_set_devstate(ASUS_WMI_DEVID_KBD_BACKLIGHT, ctrl_param, NULL);`
`470`		`- led_classdev_notify_brightness_hw_changed(&asus->kbd_led, asus->kbd_led_wk);`
`471`	`470`	`}`
`472`	`471`
`473`	`472`	`static int kbd_led_read(struct asus_wmi asus, int level, int *env)`
`@@ -521,6 +520,14 @@ static void kbd_led_set(struct led_classdev *led_cdev,`
`521`	`520`	`do_kbd_led_set(led_cdev, value);`
`522`	`521`	`}`
`523`	`522`
	`523`	`+static void kbd_led_set_by_kbd(struct asus_wmi *asus, enum led_brightness value)`
	`524`	`+{`
	`525`	`+ struct led_classdev *led_cdev = &asus->kbd_led;`
	`526`	`+`
	`527`	`+ do_kbd_led_set(led_cdev, value);`
	`528`	`+ led_classdev_notify_brightness_hw_changed(led_cdev, asus->kbd_led_wk);`
	`529`	`+}`
	`530`	`+`
`524`	`531`	`static enum led_brightness kbd_led_get(struct led_classdev *led_cdev)`
`525`	`532`	`{`
`526`	`533`	`struct asus_wmi *asus;`
`@@ -1759,18 +1766,18 @@ static void asus_wmi_notify(u32 value, void *context)`
`1759`	`1766`	`}`
`1760`	`1767`
`1761`	`1768`	`if (code == NOTIFY_KBD_BRTUP) {`
`1762`		`- do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk + 1);`
	`1769`	`+ kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1);`
`1763`	`1770`	`goto exit;`
`1764`	`1771`	`}`
`1765`	`1772`	`if (code == NOTIFY_KBD_BRTDWN) {`
`1766`		`- do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk - 1);`
	`1773`	`+ kbd_led_set_by_kbd(asus, asus->kbd_led_wk - 1);`
`1767`	`1774`	`goto exit;`
`1768`	`1775`	`}`
`1769`	`1776`	`if (code == NOTIFY_KBD_BRTTOGGLE) {`
`1770`	`1777`	`if (asus->kbd_led_wk == asus->kbd_led.max_brightness)`
`1771`		`- do_kbd_led_set(&asus->kbd_led, 0);`
	`1778`	`+ kbd_led_set_by_kbd(asus, 0);`
`1772`	`1779`	`else`
`1773`		`- do_kbd_led_set(&asus->kbd_led, asus->kbd_led_wk + 1);`
	`1780`	`+ kbd_led_set_by_kbd(asus, asus->kbd_led_wk + 1);`
`1774`	`1781`	`goto exit;`
`1775`	`1782`	`}`
`1776`	`1783`