Skip to content

Commit 9fe44fc

Browse files
starnightandy-shev
authored andcommitted
platform/x86: asus-wmi: Simplify the keyboard brightness updating process
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 <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent cacad0b commit 9fe44fc

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

drivers/platform/x86/asus-wmi.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ struct asus_wmi {
239239
int lightbar_led_wk;
240240
struct workqueue_struct *led_workqueue;
241241
struct work_struct tpd_led_work;
242-
struct work_struct kbd_led_work;
243242
struct work_struct wlan_led_work;
244243
struct work_struct lightbar_led_work;
245244

@@ -456,12 +455,9 @@ static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
456455
return read_tpd_led_state(asus);
457456
}
458457

459-
static void kbd_led_update(struct work_struct *work)
458+
static void kbd_led_update(struct asus_wmi *asus)
460459
{
461460
int ctrl_param = 0;
462-
struct asus_wmi *asus;
463-
464-
asus = container_of(work, struct asus_wmi, kbd_led_work);
465461

466462
/*
467463
* bits 0-2: level
@@ -516,7 +512,7 @@ static void do_kbd_led_set(struct led_classdev *led_cdev, int value)
516512
value = 0;
517513

518514
asus->kbd_led_wk = value;
519-
queue_work(asus->led_workqueue, &asus->kbd_led_work);
515+
kbd_led_update(asus);
520516
}
521517

522518
static void kbd_led_set(struct led_classdev *led_cdev,
@@ -671,8 +667,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus)
671667

672668
led_val = kbd_led_read(asus, NULL, NULL);
673669
if (led_val >= 0) {
674-
INIT_WORK(&asus->kbd_led_work, kbd_led_update);
675-
676670
asus->kbd_led_wk = led_val;
677671
asus->kbd_led.name = "asus::kbd_backlight";
678672
asus->kbd_led.flags = LED_BRIGHT_HW_CHANGED;
@@ -2310,7 +2304,7 @@ static int asus_hotk_resume(struct device *device)
23102304
struct asus_wmi *asus = dev_get_drvdata(device);
23112305

23122306
if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
2313-
queue_work(asus->led_workqueue, &asus->kbd_led_work);
2307+
kbd_led_update(asus);
23142308

23152309
return 0;
23162310
}
@@ -2346,7 +2340,7 @@ static int asus_hotk_restore(struct device *device)
23462340
rfkill_set_sw_state(asus->uwb.rfkill, bl);
23472341
}
23482342
if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
2349-
queue_work(asus->led_workqueue, &asus->kbd_led_work);
2343+
kbd_led_update(asus);
23502344

23512345
return 0;
23522346
}

0 commit comments

Comments
 (0)