Skip to content

Commit

Permalink
platform/x86: asus-wmi: Simplify the keyboard brightness updating pro…
Browse files Browse the repository at this point in the history
…cess

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>
  • Loading branch information
Jian-Hong Pan authored and Andy Shevchenko committed Oct 19, 2018
1 parent cacad0b commit 9fe44fc
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/platform/x86/asus-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ struct asus_wmi {
int lightbar_led_wk;
struct workqueue_struct *led_workqueue;
struct work_struct tpd_led_work;
struct work_struct kbd_led_work;
struct work_struct wlan_led_work;
struct work_struct lightbar_led_work;

Expand Down Expand Up @@ -456,12 +455,9 @@ static enum led_brightness tpd_led_get(struct led_classdev *led_cdev)
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;
struct asus_wmi *asus;

asus = container_of(work, struct asus_wmi, kbd_led_work);

/*
* bits 0-2: level
Expand Down Expand Up @@ -516,7 +512,7 @@ static void do_kbd_led_set(struct led_classdev *led_cdev, int value)
value = 0;

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,
Expand Down Expand Up @@ -671,8 +667,6 @@ static int asus_wmi_led_init(struct asus_wmi *asus)

led_val = kbd_led_read(asus, NULL, NULL);
if (led_val >= 0) {
INIT_WORK(&asus->kbd_led_work, kbd_led_update);

asus->kbd_led_wk = led_val;
asus->kbd_led.name = "asus::kbd_backlight";
asus->kbd_led.flags = LED_BRIGHT_HW_CHANGED;
Expand Down Expand Up @@ -2310,7 +2304,7 @@ static int asus_hotk_resume(struct device *device)
struct asus_wmi *asus = dev_get_drvdata(device);

if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
queue_work(asus->led_workqueue, &asus->kbd_led_work);
kbd_led_update(asus);

return 0;
}
Expand Down Expand Up @@ -2346,7 +2340,7 @@ static int asus_hotk_restore(struct device *device)
rfkill_set_sw_state(asus->uwb.rfkill, bl);
}
if (!IS_ERR_OR_NULL(asus->kbd_led.dev))
queue_work(asus->led_workqueue, &asus->kbd_led_work);
kbd_led_update(asus);

return 0;
}
Expand Down

0 comments on commit 9fe44fc

Please sign in to comment.