Skip to content

Commit 62c1fb2

Browse files
fabiobaltierikartben
fabiobaltieri
authored and
kartben
committed
led: drop min/max brightness from struct led_data
This is always 0 to 100, hardcode the range. Signed-off-by: Fabio Baltieri <[email protected]>
1 parent 69e7393 commit 62c1fb2

File tree

6 files changed

+10
-48
lines changed

6 files changed

+10
-48
lines changed

‎drivers/led/ht16k33.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,10 @@ static int ht16k33_led_set_brightness(const struct device *dev, uint32_t led,
130130
ARG_UNUSED(led);
131131

132132
const struct ht16k33_cfg *config = dev->config;
133-
struct ht16k33_data *data = dev->data;
134-
struct led_data *dev_data = &data->dev_data;
135133
uint8_t dim;
136134
uint8_t cmd;
137135

138-
dim = (value * (HT16K33_DIMMING_LEVELS - 1)) / dev_data->max_brightness;
136+
dim = (value * (HT16K33_DIMMING_LEVELS - 1)) / LED_BRIGTHNESS_MAX;
139137
cmd = HT16K33_CMD_DIMMING_SET | dim;
140138

141139
if (i2c_write_dt(&config->i2c, &cmd, sizeof(cmd))) {
@@ -299,8 +297,6 @@ static int ht16k33_init(const struct device *dev)
299297
/* Hardware specific limits */
300298
dev_data->min_period = 0U;
301299
dev_data->max_period = 2000U;
302-
dev_data->min_brightness = 0U;
303-
dev_data->max_brightness = LED_BRIGTHNESS_MAX;
304300

305301
/* System oscillator on */
306302
cmd[0] = HT16K33_CMD_SYSTEM_SETUP | HT16K33_OPT_S;

‎drivers/led/led_context.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ struct led_data {
2525
uint32_t min_period;
2626
/* Maximum acceptable LED blinking time period (in ms) */
2727
uint32_t max_period;
28-
/* Minimum acceptable LED brightness value */
29-
uint16_t min_brightness;
30-
/* Maximum acceptable LED brightness value */
31-
uint16_t max_brightness;
3228
};
3329

3430
#ifdef __cplusplus

‎drivers/led/lp3943.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ static int lp3943_led_set_brightness(const struct device *dev, uint32_t led,
169169
uint8_t value)
170170
{
171171
const struct lp3943_config *config = dev->config;
172-
struct lp3943_data *data = dev->data;
173-
struct led_data *dev_data = &data->dev_data;
174172
int ret;
175173
uint8_t reg, val, mode;
176174

@@ -187,7 +185,7 @@ static int lp3943_led_set_brightness(const struct device *dev, uint32_t led,
187185
reg = LP3943_PWM1;
188186
}
189187

190-
val = (value * 255U) / dev_data->max_brightness;
188+
val = (value * 255U) / LED_BRIGTHNESS_MAX;
191189
if (i2c_reg_write_byte_dt(&config->bus, reg, val)) {
192190
LOG_ERR("LED write failed");
193191
return -EIO;
@@ -258,8 +256,6 @@ static int lp3943_led_init(const struct device *dev)
258256
/* Hardware specific limits */
259257
dev_data->min_period = 0U;
260258
dev_data->max_period = 1600U;
261-
dev_data->min_brightness = 0U;
262-
dev_data->max_brightness = LED_BRIGTHNESS_MAX;
263259

264260
return 0;
265261
}

‎drivers/led/lp5562.c

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ LOG_MODULE_REGISTER(lp5562);
7979
*/
8080
#define LP5562_MIN_BLINK_PERIOD 1
8181

82-
/* Brightness limits in percent */
83-
#define LP5562_MIN_BRIGHTNESS 0
84-
#define LP5562_MAX_BRIGHTNESS LED_BRIGTHNESS_MAX
85-
8682
/* Output current limits in 0.1 mA */
8783
#define LP5562_MIN_CURRENT_SETTING 0
8884
#define LP5562_MAX_CURRENT_SETTING 255
@@ -609,11 +605,9 @@ static int lp5562_program_set_brightness(const struct device *dev,
609605
uint8_t command_index,
610606
uint8_t brightness)
611607
{
612-
struct lp5562_data *data = dev->data;
613-
struct led_data *dev_data = &data->dev_data;
614608
uint8_t val;
615609

616-
val = (brightness * 0xFF) / dev_data->max_brightness;
610+
val = (brightness * 0xFF) / LED_BRIGTHNESS_MAX;
617611

618612
return lp5562_program_command(dev, engine, command_index,
619613
LP5562_PROG_COMMAND_SET_PWM, val);
@@ -763,8 +757,6 @@ static int lp5562_update_blinking_brightness(const struct device *dev,
763757
static int lp5562_led_blink(const struct device *dev, uint32_t led,
764758
uint32_t delay_on, uint32_t delay_off)
765759
{
766-
struct lp5562_data *data = dev->data;
767-
struct led_data *dev_data = &data->dev_data;
768760
int ret;
769761
enum lp5562_led_sources engine;
770762
uint8_t command_index = 0U;
@@ -798,7 +790,7 @@ static int lp5562_led_blink(const struct device *dev, uint32_t led,
798790
}
799791

800792
ret = lp5562_program_set_brightness(dev, engine, command_index,
801-
dev_data->max_brightness);
793+
LED_BRIGTHNESS_MAX);
802794
if (ret) {
803795
return ret;
804796
}
@@ -809,7 +801,7 @@ static int lp5562_led_blink(const struct device *dev, uint32_t led,
809801
}
810802

811803
ret = lp5562_program_set_brightness(dev, engine, ++command_index,
812-
dev_data->min_brightness);
804+
LED_BRIGTHNESS_MAX);
813805
if (ret) {
814806
return ret;
815807
}
@@ -837,8 +829,6 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led,
837829
uint8_t value)
838830
{
839831
const struct lp5562_config *config = dev->config;
840-
struct lp5562_data *data = dev->data;
841-
struct led_data *dev_data = &data->dev_data;
842832
int ret;
843833
uint8_t val, reg;
844834
enum lp5562_led_sources current_source;
@@ -864,7 +854,7 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led,
864854
}
865855
}
866856

867-
val = (value * 0xFF) / dev_data->max_brightness;
857+
val = (value * 0xFF) / LED_BRIGTHNESS_MAX;
868858

869859
ret = lp5562_get_pwm_reg(led, &reg);
870860
if (ret) {
@@ -881,17 +871,11 @@ static int lp5562_led_set_brightness(const struct device *dev, uint32_t led,
881871

882872
static inline int lp5562_led_on(const struct device *dev, uint32_t led)
883873
{
884-
struct lp5562_data *data = dev->data;
885-
struct led_data *dev_data = &data->dev_data;
886-
887-
return lp5562_led_set_brightness(dev, led, dev_data->max_brightness);
874+
return lp5562_led_set_brightness(dev, led, LED_BRIGTHNESS_MAX);
888875
}
889876

890877
static inline int lp5562_led_off(const struct device *dev, uint32_t led)
891878
{
892-
struct lp5562_data *data = dev->data;
893-
struct led_data *dev_data = &data->dev_data;
894-
895879
int ret;
896880
enum lp5562_led_sources current_source;
897881

@@ -907,7 +891,7 @@ static inline int lp5562_led_off(const struct device *dev, uint32_t led)
907891
}
908892
}
909893

910-
return lp5562_led_set_brightness(dev, led, dev_data->min_brightness);
894+
return lp5562_led_set_brightness(dev, led, LED_BRIGTHNESS_MAX);
911895
}
912896

913897
static int lp5562_led_update_current(const struct device *dev)
@@ -1029,8 +1013,6 @@ static int lp5562_led_init(const struct device *dev)
10291013
/* Hardware specific limits */
10301014
dev_data->min_period = LP5562_MIN_BLINK_PERIOD;
10311015
dev_data->max_period = LP5562_MAX_BLINK_PERIOD;
1032-
dev_data->min_brightness = LP5562_MIN_BRIGHTNESS;
1033-
dev_data->max_brightness = LP5562_MAX_BRIGHTNESS;
10341016

10351017
ret = lp5562_led_update_current(dev);
10361018
if (ret) {

‎drivers/led/pca9633.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,10 @@ static int pca9633_led_set_brightness(const struct device *dev, uint32_t led,
121121
uint8_t value)
122122
{
123123
const struct pca9633_config *config = dev->config;
124-
struct pca9633_data *data = dev->data;
125-
struct led_data *dev_data = &data->dev_data;
126124
uint8_t val;
127125

128126
/* Set the LED brightness value */
129-
val = (value * 255U) / dev_data->max_brightness;
127+
val = (value * 255U) / LED_BRIGTHNESS_MAX;
130128
if (i2c_reg_write_byte_dt(&config->i2c,
131129
PCA9633_PWM_BASE + led,
132130
val)) {
@@ -205,8 +203,6 @@ static int pca9633_led_init(const struct device *dev)
205203
/* Hardware specific limits */
206204
dev_data->min_period = 41U;
207205
dev_data->max_period = 10667U;
208-
dev_data->min_brightness = 0U;
209-
dev_data->max_brightness = LED_BRIGTHNESS_MAX;
210206

211207
return 0;
212208
}

‎drivers/led/tlc59108.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,14 @@ static int tlc59108_led_set_brightness(const struct device *dev, uint32_t led,
138138
uint8_t value)
139139
{
140140
const struct tlc59108_cfg *config = dev->config;
141-
struct tlc59108_data *data = dev->data;
142-
struct led_data *dev_data = &data->dev_data;
143141
uint8_t val;
144142

145143
if (led > TLC59108_MAX_LED) {
146144
return -EINVAL;
147145
}
148146

149147
/* Set the LED brightness value */
150-
val = (value * 255U) / dev_data->max_brightness;
148+
val = (value * 255U) / LED_BRIGTHNESS_MAX;
151149
if (i2c_reg_write_byte_dt(&config->i2c, TLC59108_PWM_BASE + led, val)) {
152150
LOG_ERR("LED 0x%x reg write failed", TLC59108_PWM_BASE + led);
153151
return -EIO;
@@ -197,8 +195,6 @@ static int tlc59108_led_init(const struct device *dev)
197195
/* Hardware specific limits */
198196
dev_data->min_period = 41U;
199197
dev_data->max_period = 10730U;
200-
dev_data->min_brightness = 0U;
201-
dev_data->max_brightness = LED_BRIGTHNESS_MAX;
202198

203199
return 0;
204200
}

0 commit comments

Comments
 (0)