[PATCH 05/31] input: keyboard: changing LED_* from enum led_brightness to actual value

From: Luiz Sampaio
Date: Fri Jan 21 2022 - 11:54:44 EST


The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
drivers/input/keyboard/cap11xx.c | 2 +-
drivers/input/keyboard/qt2160.c | 6 +++---
drivers/input/keyboard/tm2-touchkey.c | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c
index 7c85343cd32f..04c03157ef8a 100644
--- a/drivers/input/keyboard/cap11xx.c
+++ b/drivers/input/keyboard/cap11xx.c
@@ -290,7 +290,7 @@ static int cap11xx_init_leds(struct device *dev,
led->cdev.flags = 0;
led->cdev.brightness_set_blocking = cap11xx_led_set;
led->cdev.max_brightness = 1;
- led->cdev.brightness = LED_OFF;
+ led->cdev.brightness = 0;

error = of_property_read_u32(child, "reg", &reg);
if (error != 0 || reg >= num_leds) {
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 32d4a076eaa3..b80c2195dabb 100644
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -78,7 +78,7 @@ static int qt2160_led_set(struct led_classdev *cdev,
if (value != led->brightness) {
drive = qt2160_read(client, QT2160_CMD_DRIVE_X);
pwmen = qt2160_read(client, QT2160_CMD_PWMEN_X);
- if (value != LED_OFF) {
+ if (value != 0) {
drive |= BIT(led->id);
pwmen |= BIT(led->id);

@@ -93,7 +93,7 @@ static int qt2160_led_set(struct led_classdev *cdev,
* Changing this register will change the brightness
* of every LED in the qt2160. It's a HW limitation.
*/
- if (value != LED_OFF)
+ if (value != 0)
qt2160_write(client, QT2160_CMD_PWM_DUTY, value);

led->brightness = value;
@@ -269,7 +269,7 @@ static int qt2160_register_leds(struct qt2160_data *qt2160)
snprintf(led->name, sizeof(led->name), "qt2160:x%d", i);
led->cdev.name = led->name;
led->cdev.brightness_set_blocking = qt2160_led_set;
- led->cdev.brightness = LED_OFF;
+ led->cdev.brightness = 0;
led->id = i;
led->qt2160 = qt2160;

diff --git a/drivers/input/keyboard/tm2-touchkey.c b/drivers/input/keyboard/tm2-touchkey.c
index 632cd6c1c8d4..b28ebbc75d11 100644
--- a/drivers/input/keyboard/tm2-touchkey.c
+++ b/drivers/input/keyboard/tm2-touchkey.c
@@ -91,7 +91,7 @@ static int tm2_touchkey_led_brightness_set(struct led_classdev *led_dev,
u32 volt;
u8 data;

- if (brightness == LED_OFF) {
+ if (brightness == 0) {
volt = TM2_TOUCHKEY_LED_VOLTAGE_MIN;
data = touchkey->variant->cmd_led_off;
} else {
@@ -173,9 +173,9 @@ static irqreturn_t tm2_touchkey_irq_handler(int irq, void *devid)
if (touchkey->variant->fixed_regulator &&
data & TM2_TOUCHKEY_BIT_PRESS_EV) {
/* touch turns backlight on, so make sure we're in sync */
- if (touchkey->led_dev.brightness == LED_OFF)
+ if (touchkey->led_dev.brightness == 0)
tm2_touchkey_led_brightness_set(&touchkey->led_dev,
- LED_OFF);
+ 0);
}

return IRQ_HANDLED;
@@ -280,8 +280,8 @@ static int tm2_touchkey_probe(struct i2c_client *client,

/* led device */
touchkey->led_dev.name = TM2_TOUCHKEY_DEV_NAME;
- touchkey->led_dev.brightness = LED_ON;
- touchkey->led_dev.max_brightness = LED_ON;
+ touchkey->led_dev.brightness = 1;
+ touchkey->led_dev.max_brightness = 1;
touchkey->led_dev.brightness_set_blocking =
tm2_touchkey_led_brightness_set;

@@ -293,7 +293,7 @@ static int tm2_touchkey_probe(struct i2c_client *client,
}

if (touchkey->variant->fixed_regulator)
- tm2_touchkey_led_brightness_set(&touchkey->led_dev, LED_ON);
+ tm2_touchkey_led_brightness_set(&touchkey->led_dev, 1);

return 0;
}
--
2.34.1