diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:28:14 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 15:28:14 +0200 |
| commit | ce28dae326afd4d7087b9e57e6834050da657b28 (patch) | |
| tree | f17c4c9794c60e479f5329364bb86cb76146e5b6 /drivers/hid | |
| parent | c9ce59650e5d57b986fdd4a599a46e28ccabb4d6 (diff) | |
| parent | 28a7eeb9eb40fcfeec4f663cabe8d25bb2d9bd6a (diff) | |
| download | linux-ce28dae326afd4d7087b9e57e6834050da657b28.tar.gz linux-ce28dae326afd4d7087b9e57e6834050da657b28.tar.bz2 linux-ce28dae326afd4d7087b9e57e6834050da657b28.zip | |
Merge branch 'for-6.12/picolcd' into for-linus
- Use backlight power constants (Thomas Zimmermann)
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-picolcd_backlight.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/hid-picolcd_backlight.c b/drivers/hid/hid-picolcd_backlight.c index 08d16917eb60..4b43b64537a3 100644 --- a/drivers/hid/hid-picolcd_backlight.c +++ b/drivers/hid/hid-picolcd_backlight.c @@ -31,7 +31,8 @@ static int picolcd_set_brightness(struct backlight_device *bdev) data->lcd_brightness = bdev->props.brightness & 0x0ff; data->lcd_power = bdev->props.power; spin_lock_irqsave(&data->lock, flags); - hid_set_field(report->field[0], 0, data->lcd_power == FB_BLANK_UNBLANK ? data->lcd_brightness : 0); + hid_set_field(report->field[0], 0, + data->lcd_power == BACKLIGHT_POWER_ON ? data->lcd_brightness : 0); if (!(data->status & PICOLCD_FAILED)) hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT); spin_unlock_irqrestore(&data->lock, flags); @@ -94,7 +95,7 @@ void picolcd_suspend_backlight(struct picolcd_data *data) if (!data->backlight) return; - data->backlight->props.power = FB_BLANK_POWERDOWN; + data->backlight->props.power = BACKLIGHT_POWER_OFF; picolcd_set_brightness(data->backlight); data->lcd_power = data->backlight->props.power = bl_power; } |