led: drop led_context.h

led_context.h contains a single struct with max and min period, current drivers that use it have hardcoded values and they set it at init. This data is not used anywhere, and it makes very little sense to use some SRAM for it. Hardcode the limit for each driver and drop the struct and file. Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>

Author: fabiobaltieri

drivers/led/ht16k33.c

@@ -21,8 +21,6 @@
 
 LOG_MODULE_REGISTER(ht16k33, CONFIG_LED_LOG_LEVEL);
 
-#include "led_context.h"
-
 /* HT16K33 commands and options */
 #define HT16K33_CMD_DISP_DATA_ADDR 0x00
 
@@ -61,6 +59,8 @@ LOG_MODULE_REGISTER(ht16k33, CONFIG_LED_LOG_LEVEL);
 #define HT16K33_KEYSCAN_COLS 13
 #define HT16K33_KEYSCAN_DATA_SIZE 6
 
+#define HT16K33_MAX_PERIOD 2000U
+
 struct ht16k33_cfg {
 struct i2c_dt_spec i2c;
 bool irq_enabled;
@@ -71,7 +71,6 @@ struct ht16k33_cfg {
 
 struct ht16k33_data {
 const struct device *dev;
-struct led_data dev_data;
  /* Shadow buffer for the display data RAM */
 uint8_t buffer[HT16K33_DISP_DATA_SIZE];
 #ifdef CONFIG_HT16K33_KEYSCAN
@@ -95,13 +94,11 @@ static int ht16k33_led_blink(const struct device *dev, uint32_t led,
 ARG_UNUSED(led);
 
 const struct ht16k33_cfg *config = dev->config;
-struct ht16k33_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 uint32_t period;
 uint8_t cmd;
 
 period = delay_on + delay_off;
-if (period < dev_data->min_period || period > dev_data->max_period) {
+if (period > HT16K33_MAX_PERIOD) {
 return -EINVAL;
 }
 
@@ -281,7 +278,6 @@ static int ht16k33_init(const struct device *dev)
 {
 const struct ht16k33_cfg *config = dev->config;
 struct ht16k33_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 uint8_t cmd[1 + HT16K33_DISP_DATA_SIZE]; /* 1 byte command + data */
 int err;
 
@@ -294,10 +290,6 @@ static int ht16k33_init(const struct device *dev)
 
 memset(&data->buffer, 0, sizeof(data->buffer));
 
-/* Hardware specific limits */
-dev_data->min_period = 0U;
-dev_data->max_period = 2000U;
-
 /* System oscillator on */
 cmd[0] = HT16K33_CMD_SYSTEM_SETUP | HT16K33_OPT_S;
 err = i2c_write_dt(&config->i2c, cmd, 1);

drivers/led/led_context.h

@@ -28,8 +28,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lp3943);
 
-#include "led_context.h"
-
 /* LP3943 Registers */
 #define LP3943_INPUT_1 0x00
 #define LP3943_INPUT_2 0x01
@@ -44,6 +42,8 @@ LOG_MODULE_REGISTER(lp3943);
 
 #define LP3943_MASK 0x03
 
+#define LP3943_MAX_PERIOD 1600U
+
 enum lp3943_modes {
 LP3943_OFF,
 LP3943_ON,
@@ -55,10 +55,6 @@ struct lp3943_config {
 struct i2c_dt_spec bus;
 };
 
-struct lp3943_data {
-struct led_data dev_data;
-};
-
 static int lp3943_get_led_reg(uint32_t *led, uint8_t *reg)
 {
 switch (*led) {
@@ -126,15 +122,12 @@ static int lp3943_led_blink(const struct device *dev, uint32_t led,
  uint32_t delay_on, uint32_t delay_off)
 {
 const struct lp3943_config *config = dev->config;
-struct lp3943_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 int ret;
 uint16_t period;
 uint8_t reg, val, mode;
 
 period = delay_on + delay_off;
-
-if (period < dev_data->min_period || period > dev_data->max_period) {
+if (period > LP3943_MAX_PERIOD) {
 return -EINVAL;
 }
 
@@ -151,7 +144,7 @@ static int lp3943_led_blink(const struct device *dev, uint32_t led,
 reg = LP3943_PSC1;
 }
 
-val = (period * 255U) / dev_data->max_period;
+val = period * 255U / LP3943_MAX_PERIOD;
 if (i2c_reg_write_byte_dt(&config->bus, reg, val)) {
 LOG_ERR("LED write failed");
 return -EIO;
@@ -245,23 +238,15 @@ static inline int lp3943_led_off(const struct device *dev, uint32_t led)
 static int lp3943_led_init(const struct device *dev)
 {
 const struct lp3943_config *config = dev->config;
-struct lp3943_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 
 if (!device_is_ready(config->bus.bus)) {
 LOG_ERR("I2C device not ready");
 return -ENODEV;
 }
 
-/* Hardware specific limits */
-dev_data->min_period = 0U;
-dev_data->max_period = 1600U;
-
 return 0;
 }
 
-static struct lp3943_data lp3943_led_data;
-
 static const struct lp3943_config lp3943_led_config = {
 .bus = I2C_DT_SPEC_INST_GET(0),
 };
@@ -273,6 +258,6 @@ static DEVICE_API(led, lp3943_led_api) = {
 .off = lp3943_led_off,
 };
 
-DEVICE_DT_INST_DEFINE(0, &lp3943_led_init, NULL, &lp3943_led_data,
+DEVICE_DT_INST_DEFINE(0, &lp3943_led_init, NULL, NULL,
  &lp3943_led_config, POST_KERNEL, CONFIG_LED_INIT_PRIORITY,
  &lp3943_led_api);

drivers/led/lp3943.c

@@ -41,8 +41,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lp5562);
 
-#include "led_context.h"
-
 /* Registers */
 #define LP5562_ENABLE 0x00
 #define LP5562_OP_MODE 0x01
@@ -170,10 +168,6 @@ struct lp5562_config {
 struct gpio_dt_spec enable_gpio;
 };
 
-struct lp5562_data {
-struct led_data dev_data;
-};
-
 /*
  * @brief Get the register for the given LED channel used to directly write a
  *	brightness value instead of using the execution engines.
@@ -280,8 +274,8 @@ static int lp5562_get_engine_reg_shift(enum lp5562_led_sources engine,
  * @param prescale Pointer to the prescale value.
  * @param step_time Pointer to the step_time value.
  */
-static void lp5562_ms_to_prescale_and_step(struct led_data *data, uint32_t ms,
- uint8_t *prescale, uint8_t *step_time)
+static void lp5562_ms_to_prescale_and_step(uint32_t ms, uint8_t *prescale,
+ uint8_t *step_time)
 {
 /*
  * One step with the prescaler set to 0 takes 0.49ms. The max value for
@@ -637,17 +631,14 @@ static int lp5562_program_ramp(const struct device *dev,
  uint8_t step_count,
  enum lp5562_engine_fade_dirs fade_dir)
 {
-struct lp5562_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 uint8_t prescale, step_time;
 
-if ((time_per_step < dev_data->min_period) ||
-(time_per_step > dev_data->max_period)) {
+if (time_per_step < LP5562_MIN_BLINK_PERIOD ||
+ time_per_step > LP5562_MAX_BLINK_PERIOD) {
 return -EINVAL;
 }
 
-lp5562_ms_to_prescale_and_step(dev_data, time_per_step,
-&prescale, &step_time);
+lp5562_ms_to_prescale_and_step(time_per_step, &prescale, &step_time);
 
 return lp5562_program_command(dev, engine, command_index,
 LP5562_PROG_COMMAND_RAMP_TIME(prescale, step_time),
@@ -984,8 +975,6 @@ static int lp5562_disable(const struct device *dev)
 static int lp5562_led_init(const struct device *dev)
 {
 const struct lp5562_config *config = dev->config;
-struct lp5562_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 const struct gpio_dt_spec *enable_gpio = &config->enable_gpio;
 int ret;
 
@@ -1010,10 +999,6 @@ static int lp5562_led_init(const struct device *dev)
 return ret;
 }
 
-/* Hardware specific limits */
-dev_data->min_period = LP5562_MIN_BLINK_PERIOD;
-dev_data->max_period = LP5562_MAX_BLINK_PERIOD;
-
 ret = lp5562_led_update_current(dev);
 if (ret) {
 LOG_ERR("Setting current setting LP5562 LED chip failed.");
@@ -1081,9 +1066,8 @@ static int lp5562_pm_action(const struct device *dev, enum pm_device_action acti
 \
 PM_DEVICE_DT_INST_DEFINE(id, lp5562_pm_action);	\
 \
-struct lp5562_data lp5562_data_##id;	\
 DEVICE_DT_INST_DEFINE(id, &lp5562_led_init, PM_DEVICE_DT_INST_GET(id),	\
-&lp5562_data_##id,\
+NULL,\
 &lp5562_config_##id, POST_KERNEL,	\
 CONFIG_LED_INIT_PRIORITY,	\
 &lp5562_led_api);	\

drivers/led/lp5562.c

@@ -20,8 +20,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pca9633);
 
-#include "led_context.h"
-
 /* PCA9633 select registers determine the source that drives LED outputs */
 #define PCA9633_LED_OFF 0x0 /* LED driver off */
 #define PCA9633_LED_ON 0x1 /* LED driver on */
@@ -44,27 +42,24 @@ LOG_MODULE_REGISTER(pca9633);
 
 #define PCA9633_MASK 0x03
 
+#define PCA9633_MIN_PERIOD 41U
+#define PCA9633_MAX_PERIOD 10667U
+
 struct pca9633_config {
 struct i2c_dt_spec i2c;
 bool disable_allcall;
 };
 
-struct pca9633_data {
-struct led_data dev_data;
-};
-
 static int pca9633_led_blink(const struct device *dev, uint32_t led,
  uint32_t delay_on, uint32_t delay_off)
 {
-struct pca9633_data *data = dev->data;
 const struct pca9633_config *config = dev->config;
-struct led_data *dev_data = &data->dev_data;
 uint8_t gdc, gfrq;
 uint32_t period;
 
 period = delay_on + delay_off;
 
-if (period < dev_data->min_period || period > dev_data->max_period) {
+if (period < PCA9633_MIN_PERIOD || period > PCA9633_MAX_PERIOD) {
 return -EINVAL;
 }
 
@@ -179,8 +174,6 @@ static inline int pca9633_led_off(const struct device *dev, uint32_t led)
 static int pca9633_led_init(const struct device *dev)
 {
 const struct pca9633_config *config = dev->config;
-struct pca9633_data *data = dev->data;
-struct led_data *dev_data = &data->dev_data;
 
 if (!device_is_ready(config->i2c.bus)) {
 LOG_ERR("I2C bus is not ready");
@@ -200,9 +193,6 @@ static int pca9633_led_init(const struct device *dev)
 LOG_ERR("LED reg update failed");
 return -EIO;
 }
-/* Hardware specific limits */
-dev_data->min_period = 41U;
-dev_data->max_period = 10667U;
 
 return 0;
 }
@@ -219,10 +209,9 @@ static DEVICE_API(led, pca9633_led_api) = {
 .i2c = I2C_DT_SPEC_INST_GET(id),	\
 .disable_allcall = DT_INST_PROP(id, disable_allcall),	\
 };	\
-static struct pca9633_data pca9633_##id##_data;	\
 \
 DEVICE_DT_INST_DEFINE(id, &pca9633_led_init, NULL,	\
-&pca9633_##id##_data,\
+NULL,\
 &pca9633_##id##_cfg, POST_KERNEL,	\
 CONFIG_LED_INIT_PRIORITY,	\
 &pca9633_led_api);