Abstract kbd backlight setting. While at it also replace the ugly
uint8_t type with u8.
This is a preparation patch for making lenovo-yogabook-wmi also work
on the Android version of the Yoga Book 1 which does not have a WMI
interface to deal with toggling the keyboard half between
touch-keyboard and wacom-digitizer mode.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
---
drivers/platform/x86/lenovo-yogabook-wmi.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/lenovo-yogabook-wmi.c b/drivers/platform/x86/lenovo-yogabook-wmi.c
index 8d461fb8eac3..efdb20bfe8f5 100644
--- a/drivers/platform/x86/lenovo-yogabook-wmi.c
+++ b/drivers/platform/x86/lenovo-yogabook-wmi.c
@@ -32,19 +32,19 @@ struct yogabook_wmi {
struct device *dig_dev;
struct led_classdev *pen_led;
struct gpio_desc *backside_hall_gpio;
+ int (*set_kbd_backlight)(struct yogabook_wmi *data, u8 level);
int backside_hall_irq;
struct work_struct work;
struct led_classdev kbd_bl_led;
unsigned long flags;
- uint8_t brightness;
+ u8 brightness;
};
/*
* To control keyboard backlight, call the method KBLC() of the TCS1 ACPI
* device (Goodix touchpad acts as virtual sensor keyboard).
*/
-static int yogabook_wmi_set_kbd_backlight(struct yogabook_wmi *data,
- uint8_t level)
+static int yogabook_wmi_set_kbd_backlight(struct yogabook_wmi *data, u8 level)
{
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_object_list input;
@@ -98,7 +98,7 @@ static void yogabook_wmi_work(struct work_struct *work)
* Must be done before releasing the keyboard touchscreen driver,
* so that the keyboard touchscreen dev is still in D0.
*/
- yogabook_wmi_set_kbd_backlight(data, 0);
+ data->set_kbd_backlight(data, 0);
device_release_driver(data->kbd_dev);
clear_bit(YB_KBD_IS_ON, &data->flags);
}
@@ -114,7 +114,7 @@ static void yogabook_wmi_work(struct work_struct *work)
if (r)
dev_warn(data->dev, "Reprobe of keyboard touchscreen failed: %d\n", r);
- yogabook_wmi_set_kbd_backlight(data, data->brightness);
+ data->set_kbd_backlight(data, data->brightness);
set_bit(YB_KBD_IS_ON, &data->flags);
}
@@ -183,7 +183,7 @@ static int kbd_brightness_set(struct led_classdev *cdev,
if (!test_bit(YB_KBD_IS_ON, &data->flags))
return 0;
- return yogabook_wmi_set_kbd_backlight(data, data->brightness);
+ return data->set_kbd_backlight(data, data->brightness);
}
static struct gpiod_lookup_table yogabook_wmi_gpios = {
@@ -241,7 +241,7 @@ static int yogabook_probe(struct device *dev, struct yogabook_wmi *data,
data->backside_hall_irq = r;
/* Set default brightness before enabling the IRQ */
- yogabook_wmi_set_kbd_backlight(data, YB_KBD_BL_DEFAULT);
+ data->set_kbd_backlight(data, YB_KBD_BL_DEFAULT);
r = request_irq(data->backside_hall_irq, yogabook_backside_hall_irq,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
@@ -307,6 +307,8 @@ static int yogabook_wmi_probe(struct wmi_device *wdev, const void *context)
goto error_put_devs;
}
+ data->set_kbd_backlight = yogabook_wmi_set_kbd_backlight;
+
r = yogabook_probe(dev, data, "ybwmi::kbd_backlight");
if (r)
goto error_put_devs;
@@ -365,7 +367,7 @@ static int yogabook_resume(struct device *dev)
struct yogabook_wmi *data = dev_get_drvdata(dev);
if (test_bit(YB_KBD_IS_ON, &data->flags))
- yogabook_wmi_set_kbd_backlight(data, data->brightness);
+ data->set_kbd_backlight(data, data->brightness);
clear_bit(YB_SUSPENDED, &data->flags);
--
2.39.2
