shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

platform/x86: asus-wmi: Simplify the keyboard brightness updating process

Browse Source 
The original asus-wmi queues a work which calls the ACPI/WMI methods to
update the keyboard LED brightness.  Similar drivers - acer-wmi,
dell-wmi-led just call the ACPI/WMI methods directly without workqueues.

This patch simplifies the keyboard brightness updating process which
calls the kbd_led_update function directly without workqueue in
asus-wmi.

Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Jian-Hong Pan
2018-09-27 16:50:09 +08:00
committed by Andy Shevchenko
parent cacad0b2e3
commit 9fe44fc98c
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/platform/x86/asus-wmi.c
View File

@@ -239,7 +239,6 @@ struct asus_wmi {
int lightbar_led_wk; int lightbar_led_wk;
struct workqueue_struct *led_workqueue; struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work; struct work_struct tpd_led_work;
struct work_struct kbd_led_work;
struct work_struct wlan_led_work; struct work_struct wlan_led_work;
struct work_struct lightbar_led_work; struct work_struct lightbar_led_work;
@@ -456,12 +455,9 @@ static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
return read_tpd_led_state(asus); return read_tpd_led_state(asus);
} }
static void kbd_led_update(struct work_struct *work) static void kbd_led_update(struct asus_wmi *asus)
{ {
int ctrl_param = 0; int ctrl_param = 0;
struct asus_wmi *asus;
asus = container_of(work, struct asus_wmi, kbd_led_work);
/* /*
* bits 0-2: level * bits 0-2: level
@@ -516,7 +512,7 @@ static void do_kbd_led_set(struct led_classdev *led_cdev, int value)
value = 0; value = 0;
asus->kbd_led_wk = value; asus->kbd_led_wk = value;
queue_work(asus->led_workqueue, &asus->kbd_led_work); kbd_led_update(asus);
} }
static void kbd_led_set(struct led_classdev *led_cdev, static void kbd_led_set(struct led_classdev *led_cdev,
@@ -671,8 +667,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
led_val = kbd_led_read(asus, NULL, NULL); led_val = kbd_led_read(asus, NULL, NULL);
if (led_val >= 0) { if (led_val >= 0) {
INIT_WORK(&asus->kbd_led_work, kbd_led_update);
asus->kbd_led_wk = led_val; asus->kbd_led_wk = led_val;
asus->kbd_led.name = "asus::kbd_backlight"; asus->kbd_led.name = "asus::kbd_backlight";
asus->kbd_led.flags = LED_BRIGHT_HW_CHANGED; asus->kbd_led.flags = LED_BRIGHT_HW_CHANGED;
@@ -2310,7 +2304,7 @@ static int asus_hotk_resume(struct device *device)
struct asus_wmi *asus = dev_get_drvdata(device); struct asus_wmi *asus = dev_get_drvdata(device);
if (!IS_ERR_OR_NULL(asus->kbd_led.dev)) if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
queue_work(asus->led_workqueue, &asus->kbd_led_work); kbd_led_update(asus);
return 0; return 0;
} }
@@ -2346,7 +2340,7 @@ static int asus_hotk_restore(struct device *device)
rfkill_set_sw_state(asus->uwb.rfkill, bl); rfkill_set_sw_state(asus->uwb.rfkill, bl);
} }
if (!IS_ERR_OR_NULL(asus->kbd_led.dev)) if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
queue_work(asus->led_workqueue, &asus->kbd_led_work); kbd_led_update(asus);
return 0; return 0;
} }