diff --git a/boards/arm/thingy52_nrf52832/board.c b/boards/arm/thingy52_nrf52832/board.c index f9045709187..5782b9b6bd7 100644 --- a/boards/arm/thingy52_nrf52832/board.c +++ b/boards/arm/thingy52_nrf52832/board.c @@ -18,7 +18,7 @@ struct pwr_ctrl_cfg { static int pwr_ctrl_init(struct device *dev) { - const struct pwr_ctrl_cfg *cfg = dev->config_info; + const struct pwr_ctrl_cfg *cfg = dev->config; struct device *gpio; gpio = device_get_binding(cfg->port); diff --git a/doc/reference/drivers/index.rst b/doc/reference/drivers/index.rst index ae912ed6db3..4fca1a6f329 100644 --- a/doc/reference/drivers/index.rst +++ b/doc/reference/drivers/index.rst @@ -520,7 +520,7 @@ For example: } #define DEV_CFG(_dev) \ - ((const struct my_driver_config *)((_dev)->config_info)) + ((const struct my_driver_config *)((_dev)->config)) #define DEV_DATA(_dev) \ ((struct my_driver_dev_data *)((_dev)->driver_data)) diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c index 27cc44d3e62..abf315cb55f 100644 --- a/drivers/adc/adc_lmp90xxx.c +++ b/drivers/adc/adc_lmp90xxx.c @@ -176,7 +176,7 @@ static inline uint8_t lmp90xxx_inst2_sz(size_t len) static int lmp90xxx_read_reg(struct device *dev, uint8_t addr, uint8_t *dptr, size_t len) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; struct lmp90xxx_data *data = dev->driver_data; uint8_t ura = LMP90XXX_URA(addr); uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura }; @@ -250,7 +250,7 @@ static int lmp90xxx_read_reg8(struct device *dev, uint8_t addr, uint8_t *val) static int lmp90xxx_write_reg(struct device *dev, uint8_t addr, uint8_t *dptr, size_t len) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; struct lmp90xxx_data *data = dev->driver_data; uint8_t ura = LMP90XXX_URA(addr); uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura }; @@ -328,7 +328,7 @@ static int lmp90xxx_soft_reset(struct device *dev) static inline bool lmp90xxx_has_channel(struct device *dev, uint8_t channel) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; if (channel >= config->channels) { return false; @@ -339,7 +339,7 @@ static inline bool lmp90xxx_has_channel(struct device *dev, uint8_t channel) static inline bool lmp90xxx_has_input(struct device *dev, uint8_t input) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; if (input >= LMP90XXX_MAX_INPUTS) { return false; @@ -497,7 +497,7 @@ static int lmp90xxx_validate_buffer_size(const struct adc_sequence *sequence) static int lmp90xxx_adc_start_read(struct device *dev, const struct adc_sequence *sequence) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; struct lmp90xxx_data *data = dev->driver_data; int err; @@ -570,7 +570,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static int lmp90xxx_adc_read_channel(struct device *dev, uint8_t channel, int32_t *result) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; struct lmp90xxx_data *data = dev->driver_data; uint8_t adc_done; uint8_t ch_scan; @@ -914,7 +914,7 @@ int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) static int lmp90xxx_init(struct device *dev) { - const struct lmp90xxx_config *config = dev->config_info; + const struct lmp90xxx_config *config = dev->config; struct lmp90xxx_data *data = dev->driver_data; struct device *drdyb_dev; k_tid_t tid; diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c index c5b98fa6291..a7faa42cc25 100644 --- a/drivers/adc/adc_mcp320x.c +++ b/drivers/adc/adc_mcp320x.c @@ -52,7 +52,7 @@ struct mcp320x_data { static int mcp320x_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) { - const struct mcp320x_config *config = dev->config_info; + const struct mcp320x_config *config = dev->config; struct mcp320x_data *data = dev->driver_data; if (channel_cfg->gain != ADC_GAIN_1) { @@ -86,7 +86,7 @@ static int mcp320x_channel_setup(struct device *dev, static int mcp320x_validate_buffer_size(struct device *dev, const struct adc_sequence *sequence) { - const struct mcp320x_config *config = dev->config_info; + const struct mcp320x_config *config = dev->config; uint8_t channels = 0; size_t needed; uint32_t mask; @@ -112,7 +112,7 @@ static int mcp320x_validate_buffer_size(struct device *dev, static int mcp320x_start_read(struct device *dev, const struct adc_sequence *sequence) { - const struct mcp320x_config *config = dev->config_info; + const struct mcp320x_config *config = dev->config; struct mcp320x_data *data = dev->driver_data; int err; @@ -181,7 +181,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static int mcp320x_read_channel(struct device *dev, uint8_t channel, uint16_t *result) { - const struct mcp320x_config *config = dev->config_info; + const struct mcp320x_config *config = dev->config; struct mcp320x_data *data = dev->driver_data; uint8_t tx_bytes[2]; uint8_t rx_bytes[2]; @@ -273,7 +273,7 @@ static void mcp320x_acquisition_thread(struct device *dev) static int mcp320x_init(struct device *dev) { - const struct mcp320x_config *config = dev->config_info; + const struct mcp320x_config *config = dev->config; struct mcp320x_data *data = dev->driver_data; k_sem_init(&data->sem, 0, 1); diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c index a25eb5fbc8b..6a086c54e99 100644 --- a/drivers/adc/adc_mcux_adc12.c +++ b/drivers/adc/adc_mcux_adc12.c @@ -73,7 +73,7 @@ static int mcux_adc12_channel_setup(struct device *dev, static int mcux_adc12_start_read(struct device *dev, const struct adc_sequence *sequence) { - const struct mcux_adc12_config *config = dev->config_info; + const struct mcux_adc12_config *config = dev->config; struct mcux_adc12_data *data = dev->driver_data; adc12_hardware_average_mode_t mode; adc12_resolution_t resolution; @@ -152,7 +152,7 @@ static int mcux_adc12_read(struct device *dev, static void mcux_adc12_start_channel(struct device *dev) { - const struct mcux_adc12_config *config = dev->config_info; + const struct mcux_adc12_config *config = dev->config; struct mcux_adc12_data *data = dev->driver_data; adc12_channel_config_t channel_config; @@ -191,7 +191,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static void mcux_adc12_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_adc12_config *config = dev->config_info; + const struct mcux_adc12_config *config = dev->config; struct mcux_adc12_data *data = dev->driver_data; ADC_Type *base = config->base; uint32_t channel_group = 0U; @@ -213,7 +213,7 @@ static void mcux_adc12_isr(void *arg) static int mcux_adc12_init(struct device *dev) { - const struct mcux_adc12_config *config = dev->config_info; + const struct mcux_adc12_config *config = dev->config; struct mcux_adc12_data *data = dev->driver_data; ADC_Type *base = config->base; adc12_config_t adc_config; diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c index 4921401d477..2a7536df891 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -66,7 +66,7 @@ static int mcux_adc16_channel_setup(struct device *dev, static int start_read(struct device *dev, const struct adc_sequence *sequence) { - const struct mcux_adc16_config *config = dev->config_info; + const struct mcux_adc16_config *config = dev->config; struct mcux_adc16_data *data = dev->driver_data; adc16_hardware_average_mode_t mode; adc16_resolution_t resolution; @@ -162,7 +162,7 @@ static int mcux_adc16_read_async(struct device *dev, static void mcux_adc16_start_channel(struct device *dev) { - const struct mcux_adc16_config *config = dev->config_info; + const struct mcux_adc16_config *config = dev->config; struct mcux_adc16_data *data = dev->driver_data; adc16_channel_config_t channel_config; @@ -205,7 +205,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, static void mcux_adc16_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_adc16_config *config = dev->config_info; + const struct mcux_adc16_config *config = dev->config; struct mcux_adc16_data *data = dev->driver_data; ADC_Type *base = config->base; uint32_t channel_group = 0U; @@ -227,7 +227,7 @@ static void mcux_adc16_isr(void *arg) static int mcux_adc16_init(struct device *dev) { - const struct mcux_adc16_config *config = dev->config_info; + const struct mcux_adc16_config *config = dev->config; struct mcux_adc16_data *data = dev->driver_data; ADC_Type *base = config->base; adc16_config_t adc_config; diff --git a/drivers/adc/adc_sam0.c b/drivers/adc/adc_sam0.c index 50b40e81293..66ef63d1a17 100644 --- a/drivers/adc/adc_sam0.c +++ b/drivers/adc/adc_sam0.c @@ -59,7 +59,7 @@ struct adc_sam0_cfg { }; #define DEV_CFG(dev) \ - ((const struct adc_sam0_cfg *const)(dev)->config_info) + ((const struct adc_sam0_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct adc_sam0_data *)(dev)->driver_data) diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index 34ff6f925db..cde2d2aa01a 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -63,7 +63,7 @@ struct adc_sam_cfg { }; #define DEV_CFG(dev) \ - ((const struct adc_sam_cfg *const)(dev)->config_info) + ((const struct adc_sam_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct adc_sam_data *)(dev)->driver_data) diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index 9b3dd02f32d..2a37b59c531 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -245,7 +245,7 @@ static int check_buffer_size(const struct adc_sequence *sequence, static void adc_stm32_start_conversion(struct device *dev) { - const struct adc_stm32_cfg *config = dev->config_info; + const struct adc_stm32_cfg *config = dev->config; ADC_TypeDef *adc = (ADC_TypeDef *)config->base; LOG_DBG("Starting conversion"); @@ -265,7 +265,7 @@ static void adc_stm32_start_conversion(struct device *dev) static int start_read(struct device *dev, const struct adc_sequence *sequence) { - const struct adc_stm32_cfg *config = dev->config_info; + const struct adc_stm32_cfg *config = dev->config; struct adc_stm32_data *data = dev->driver_data; ADC_TypeDef *adc = (ADC_TypeDef *)config->base; uint8_t resolution; @@ -390,7 +390,7 @@ static void adc_stm32_isr(void *arg) struct device *dev = (struct device *)arg; struct adc_stm32_data *data = (struct adc_stm32_data *)dev->driver_data; const struct adc_stm32_cfg *config = - (const struct adc_stm32_cfg *)dev->config_info; + (const struct adc_stm32_cfg *)dev->config; ADC_TypeDef *adc = config->base; *data->buffer++ = LL_ADC_REG_ReadConversionData32(adc); @@ -450,7 +450,7 @@ static void adc_stm32_setup_speed(struct device *dev, uint8_t id, uint8_t acq_time_index) { const struct adc_stm32_cfg *config = - (const struct adc_stm32_cfg *)dev->config_info; + (const struct adc_stm32_cfg *)dev->config; ADC_TypeDef *adc = config->base; #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32L0X) @@ -523,7 +523,7 @@ static int adc_stm32_channel_setup(struct device *dev, static void adc_stm32_calib(struct device *dev) { const struct adc_stm32_cfg *config = - (const struct adc_stm32_cfg *)dev->config_info; + (const struct adc_stm32_cfg *)dev->config; ADC_TypeDef *adc = config->base; #if defined(CONFIG_SOC_SERIES_STM32F3X) || \ @@ -545,7 +545,7 @@ static void adc_stm32_calib(struct device *dev) static int adc_stm32_init(struct device *dev) { struct adc_stm32_data *data = dev->driver_data; - const struct adc_stm32_cfg *config = dev->config_info; + const struct adc_stm32_cfg *config = dev->config; struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); ADC_TypeDef *adc = (ADC_TypeDef *)config->base; diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h index 31aefe064ab..1a00f95b15b 100644 --- a/drivers/audio/mpxxdtyy.h +++ b/drivers/audio/mpxxdtyy.h @@ -20,7 +20,7 @@ extern "C" { #define MPXXDTYY_MAX_PDM_FREQ 3250000 /* 3.25MHz */ #define DEV_CFG(dev) \ - ((const struct mpxxdtyy_config *const)(dev)->config_info) + ((const struct mpxxdtyy_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct mpxxdtyy_data *const)(dev)->driver_data) diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c index adda40bc59c..f4c92ff0143 100644 --- a/drivers/audio/tlv320dac310x.c +++ b/drivers/audio/tlv320dac310x.c @@ -51,7 +51,7 @@ static struct codec_driver_config codec_device_config = { static struct codec_driver_data codec_device_data; #define DEV_CFG(dev) \ - ((struct codec_driver_config *const)(dev)->config_info) + ((struct codec_driver_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct codec_driver_data *const)(dev)->driver_data) diff --git a/drivers/can/can_loopback.h b/drivers/can/can_loopback.h index 3ef1cb29aa5..89fb477eaa6 100644 --- a/drivers/can/can_loopback.h +++ b/drivers/can/can_loopback.h @@ -12,7 +12,7 @@ #define DEV_DATA(dev) ((struct can_loopback_data *const)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct can_loopback_config *const)(dev)->config_info) + ((const struct can_loopback_config *const)(dev)->config) struct can_loopback_filter { can_rx_callback_t rx_cb; diff --git a/drivers/can/can_mcp2515.h b/drivers/can/can_mcp2515.h index cb214036dc0..0a6de103b3e 100644 --- a/drivers/can/can_mcp2515.h +++ b/drivers/can/can_mcp2515.h @@ -15,7 +15,7 @@ #define MCP2515_FRAME_LEN 13 #define DEV_CFG(dev) \ - ((const struct mcp2515_config *const)(dev)->config_info) + ((const struct mcp2515_config *const)(dev)->config) #define DEV_DATA(dev) ((struct mcp2515_data *const)(dev)->driver_data) struct mcp2515_tx_cb { diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c index 3fc006b5330..715891b9689 100644 --- a/drivers/can/can_mcux_flexcan.c +++ b/drivers/can/can_mcux_flexcan.c @@ -95,7 +95,7 @@ struct mcux_flexcan_data { static int mcux_flexcan_configure(struct device *dev, enum can_mode mode, uint32_t bitrate) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; flexcan_config_t flexcan_config; struct device *clock_dev; uint32_t clock_freq; @@ -249,7 +249,7 @@ static int mcux_flexcan_send(struct device *dev, const struct zcan_frame *msg, k_timeout_t timeout, can_tx_callback_t callback_isr, void *callback_arg) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; flexcan_mb_transfer_t xfer; status_t status; @@ -299,7 +299,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr, void *callback_arg, const struct zcan_filter *filter) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; flexcan_mb_transfer_t xfer; status_t status; @@ -361,7 +361,7 @@ static void mcux_flexcan_register_state_change_isr(struct device *dev, static enum can_state mcux_flexcan_get_state(struct device *dev, struct can_bus_err_cnt *err_cnt) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; uint32_t status_flags; if (err_cnt) { @@ -386,7 +386,7 @@ static enum can_state mcux_flexcan_get_state(struct device *dev, #ifndef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; int ret = 0; uint64_t start_time; @@ -414,7 +414,7 @@ int mcux_flexcan_recover(struct device *dev, k_timeout_t timeout) static void mcux_flexcan_detach(struct device *dev, int filter_id) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; if (filter_id >= MCUX_FLEXCAN_MAX_RX) { @@ -443,7 +443,7 @@ static void mcux_flexcan_detach(struct device *dev, int filter_id) static inline void mcux_flexcan_transfer_error_status(struct device *dev, uint32_t error) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; can_tx_callback_t function; int status = CAN_TX_OK; @@ -545,7 +545,7 @@ static inline void mcux_flexcan_transfer_tx_idle(struct device *dev, static inline void mcux_flexcan_transfer_rx_idle(struct device *dev, uint32_t mb) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; can_rx_callback_t function; flexcan_mb_transfer_t xfer; @@ -610,7 +610,7 @@ static void mcux_flexcan_transfer_callback(CAN_Type *base, static void mcux_flexcan_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; FLEXCAN_TransferHandleIRQ(config->base, &data->handle); @@ -618,7 +618,7 @@ static void mcux_flexcan_isr(void *arg) static int mcux_flexcan_init(struct device *dev) { - const struct mcux_flexcan_config *config = dev->config_info; + const struct mcux_flexcan_config *config = dev->config; struct mcux_flexcan_data *data = dev->driver_data; int err; int i; diff --git a/drivers/can/can_stm32.h b/drivers/can/can_stm32.h index e53f77382d3..46852c2a5f8 100644 --- a/drivers/can/can_stm32.h +++ b/drivers/can/can_stm32.h @@ -12,7 +12,7 @@ #define DEV_DATA(dev) ((struct can_stm32_data *const)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct can_stm32_config *const)(dev)->config_info) + ((const struct can_stm32_config *const)(dev)->config) #define BIT_SEG_LENGTH(cfg) ((cfg)->prop_ts1 + (cfg)->ts2 + 1) diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c index f1a0a499e02..b6eb1c46759 100644 --- a/drivers/clock_control/beetle_clock_control.c +++ b/drivers/clock_control/beetle_clock_control.c @@ -133,7 +133,7 @@ static int beetle_clock_control_get_subsys_rate(struct device *clock, { #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL const struct beetle_clock_control_cfg_t * const cfg = - clock->config_info; + clock->config; uint32_t nc_mainclk = beetle_round_freq(cfg->freq); *rate = nc_mainclk; @@ -219,7 +219,7 @@ static int beetle_clock_control_init(struct device *dev) { #ifdef CONFIG_CLOCK_CONTROL_BEETLE_ENABLE_PLL const struct beetle_clock_control_cfg_t * const cfg = - dev->config_info; + dev->config; /* * Enable PLL if Beetle is configured to run at a different diff --git a/drivers/clock_control/clock_control_esp32.c b/drivers/clock_control/clock_control_esp32.c index a3ad34cdc8e..57ab494a02f 100644 --- a/drivers/clock_control/clock_control_esp32.c +++ b/drivers/clock_control/clock_control_esp32.c @@ -58,7 +58,7 @@ struct pll_cfg { #define DPORT_CPUPERIOD_SEL_160 1 #define DPORT_CPUPERIOD_SEL_240 2 -#define DEV_CFG(dev) ((struct esp32_clock_config *)(dev->config_info)) +#define DEV_CFG(dev) ((struct esp32_clock_config *)(dev->config)) #define GET_REG_BANK(module_id) ((uint32_t)module_id / 32U) #define GET_REG_OFFSET(module_id) ((uint32_t)module_id % 32U) diff --git a/drivers/clock_control/clock_control_lpc11u6x.c b/drivers/clock_control/clock_control_lpc11u6x.c index 2693663b5b3..0d43e8b7721 100644 --- a/drivers/clock_control/clock_control_lpc11u6x.c +++ b/drivers/clock_control/clock_control_lpc11u6x.c @@ -15,7 +15,7 @@ #include "clock_control_lpc11u6x.h" #define DEV_CFG(dev) ((const struct lpc11u6x_syscon_config *) \ - ((dev)->config_info)) + ((dev)->config)) #define DEV_DATA(dev) ((struct lpc11u6x_syscon_data *) \ ((dev)->driver_data)) diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c index 985fd8bb10c..e67933d9d01 100644 --- a/drivers/clock_control/clock_control_mcux_pcc.c +++ b/drivers/clock_control/clock_control_mcux_pcc.c @@ -22,7 +22,7 @@ struct mcux_pcc_config { uint32_t base_address; }; -#define DEV_CFG(dev) ((struct mcux_pcc_config *)(dev->config_info)) +#define DEV_CFG(dev) ((struct mcux_pcc_config *)(dev->config)) #define DEV_BASE(dev) (DEV_CFG(dev)->base_address) #ifndef MAKE_PCC_REGADDR #define MAKE_PCC_REGADDR(base, offset) ((base) + (offset)) diff --git a/drivers/clock_control/clock_control_rv32m1_pcc.c b/drivers/clock_control/clock_control_rv32m1_pcc.c index d770bccc707..a81f76b42a4 100644 --- a/drivers/clock_control/clock_control_rv32m1_pcc.c +++ b/drivers/clock_control/clock_control_rv32m1_pcc.c @@ -18,7 +18,7 @@ struct rv32m1_pcc_config { uint32_t base_address; }; -#define DEV_CFG(dev) ((struct rv32m1_pcc_config *)(dev->config_info)) +#define DEV_CFG(dev) ((struct rv32m1_pcc_config *)(dev->config)) #define DEV_BASE(dev) (DEV_CFG(dev)->base_address) static inline clock_ip_name_t clock_ip(struct device *dev, diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c index 610d3a6e164..a18904cb9ff 100644 --- a/drivers/clock_control/nrf_power_clock.c +++ b/drivers/clock_control/nrf_power_clock.c @@ -119,7 +119,7 @@ static const struct nrf_clock_control_sub_config *get_sub_config( enum clock_control_nrf_type type) { const struct nrf_clock_control_config *config = - dev->config_info; + dev->config; return &config->subsys[type]; } diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c index 6628722ffa2..c09bb6f56cd 100644 --- a/drivers/console/ipm_console_receiver.c +++ b/drivers/console/ipm_console_receiver.c @@ -28,7 +28,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3) d = (struct device *)arg1; driver_data = d->driver_data; - config_info = d->config_info; + config_info = d->config; ARG_UNUSED(arg2); size32 = 0U; pos = 0; @@ -118,7 +118,7 @@ static void ipm_console_receive_callback(struct device *ipm_dev, void *context, int ipm_console_receiver_init(struct device *d) { const struct ipm_console_receiver_config_info *config_info = - d->config_info; + d->config; struct ipm_console_receiver_runtime_data *driver_data = d->driver_data; struct device *ipm; diff --git a/drivers/console/ipm_console_sender.c b/drivers/console/ipm_console_sender.c index c92e8e9be33..df033aa66ba 100644 --- a/drivers/console/ipm_console_sender.c +++ b/drivers/console/ipm_console_sender.c @@ -37,7 +37,7 @@ int ipm_console_sender_init(struct device *d) { const struct ipm_console_sender_config_info *config_info; - config_info = d->config_info; + config_info = d->config; ipm_console_device = device_get_binding(config_info->bind_to); if (!ipm_console_device) { diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c index 44581f685f6..7cb1c3d34c4 100644 --- a/drivers/console/uart_mux.c +++ b/drivers/console/uart_mux.c @@ -234,7 +234,7 @@ static int uart_mux_init(struct device *dev) k_work_init(&dev_data->cb_work, uart_mux_cb_work); LOG_DBG("Device %s dev %p dev_data %p cfg %p created", - dev->name, dev, dev_data, dev->config_info); + dev->name, dev, dev_data, dev->config); return 0; } diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c index d1973459831..f5b0d4b897e 100644 --- a/drivers/counter/counter_gecko_rtcc.c +++ b/drivers/counter/counter_gecko_rtcc.c @@ -41,7 +41,7 @@ struct counter_gecko_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct counter_gecko_config * const)(dev)->config_info) + ((const struct counter_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct counter_gecko_data *const)(dev)->driver_data) diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c index 583fed412f5..ceaa9a38391 100644 --- a/drivers/counter/counter_imx_epit.c +++ b/drivers/counter/counter_imx_epit.c @@ -25,7 +25,7 @@ struct imx_epit_data { static inline const struct imx_epit_config *get_epit_config(struct device *dev) { - return CONTAINER_OF(dev->config_info, struct imx_epit_config, + return CONTAINER_OF(dev->config, struct imx_epit_config, info); } diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c index 54dbd971660..63a886c99b5 100644 --- a/drivers/counter/counter_ll_stm32_rtc.c +++ b/drivers/counter/counter_ll_stm32_rtc.c @@ -58,7 +58,7 @@ struct rtc_stm32_data { #define DEV_DATA(dev) ((struct rtc_stm32_data *)(dev)->driver_data) #define DEV_CFG(dev) \ -((const struct rtc_stm32_config * const)(dev)->config_info) +((const struct rtc_stm32_config * const)(dev)->config) static void rtc_stm32_irq_config(struct device *dev); @@ -215,7 +215,7 @@ static uint32_t rtc_stm32_get_pending_int(struct device *dev) static uint32_t rtc_stm32_get_top_value(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; return info->max_top_value; } @@ -224,7 +224,7 @@ static uint32_t rtc_stm32_get_top_value(struct device *dev) static int rtc_stm32_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; if ((cfg->ticks != info->max_top_value) || !(cfg->flags & COUNTER_TOP_CFG_DONT_RESET)) { @@ -239,7 +239,7 @@ static int rtc_stm32_set_top_value(struct device *dev, static uint32_t rtc_stm32_get_max_relative_alarm(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; return info->max_top_value; } diff --git a/drivers/counter/counter_mchp_xec.c b/drivers/counter/counter_mchp_xec.c index b525dcfb875..35e584857e1 100644 --- a/drivers/counter/counter_mchp_xec.c +++ b/drivers/counter/counter_mchp_xec.c @@ -48,11 +48,11 @@ struct counter_xec_data { #define COUNTER_XEC_REG_BASE(_dev) \ ((BTMR_Type *) \ ((const struct counter_xec_config * const) \ - _dev->config_info)->base_address) + _dev->config)->base_address) #define COUNTER_XEC_CONFIG(_dev) \ (((const struct counter_xec_config * const) \ - _dev->config_info)) + _dev->config)) #define COUNTER_XEC_DATA(_dev) \ ((struct counter_xec_data *)dev->driver_data) diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c index a418cc382ba..a0ea2318292 100644 --- a/drivers/counter/counter_mcux_gpt.c +++ b/drivers/counter/counter_mcux_gpt.c @@ -28,7 +28,7 @@ struct mcux_gpt_data { static int mcux_gpt_start(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; GPT_StartTimer(config->base); @@ -37,7 +37,7 @@ static int mcux_gpt_start(struct device *dev) static int mcux_gpt_stop(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; GPT_StopTimer(config->base); @@ -46,7 +46,7 @@ static int mcux_gpt_stop(struct device *dev) static int mcux_gpt_get_value(struct device *dev, uint32_t *ticks) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; *ticks = GPT_GetCurrentTimerCount(config->base); return 0; @@ -55,7 +55,7 @@ static int mcux_gpt_get_value(struct device *dev, uint32_t *ticks) static int mcux_gpt_set_alarm(struct device *dev, uint8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; struct mcux_gpt_data *data = dev->driver_data; uint32_t current = GPT_GetCurrentTimerCount(config->base); @@ -86,7 +86,7 @@ static int mcux_gpt_set_alarm(struct device *dev, uint8_t chan_id, static int mcux_gpt_cancel_alarm(struct device *dev, uint8_t chan_id) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; struct mcux_gpt_data *data = dev->driver_data; if (chan_id != 0) { @@ -103,7 +103,7 @@ static int mcux_gpt_cancel_alarm(struct device *dev, uint8_t chan_id) void mcux_gpt_isr(void *p) { struct device *dev = p; - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; struct mcux_gpt_data *data = dev->driver_data; uint32_t current = GPT_GetCurrentTimerCount(config->base); uint32_t status; @@ -128,7 +128,7 @@ void mcux_gpt_isr(void *p) static uint32_t mcux_gpt_get_pending_int(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; return GPT_GetStatusFlags(config->base, kGPT_OutputCompare1Flag); } @@ -136,7 +136,7 @@ static uint32_t mcux_gpt_get_pending_int(struct device *dev) static int mcux_gpt_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; struct mcux_gpt_data *data = dev->driver_data; if (cfg->ticks != config->info.max_top_value) { @@ -155,21 +155,21 @@ static int mcux_gpt_set_top_value(struct device *dev, static uint32_t mcux_gpt_get_top_value(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; return config->info.max_top_value; } static uint32_t mcux_gpt_get_max_relative_alarm(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; return config->info.max_top_value; } static int mcux_gpt_init(struct device *dev) { - const struct mcux_gpt_config *config = dev->config_info; + const struct mcux_gpt_config *config = dev->config; gpt_config_t gptConfig; uint32_t clock_freq; diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c index 21662d76afe..481e18a1b37 100644 --- a/drivers/counter/counter_mcux_lptmr.c +++ b/drivers/counter/counter_mcux_lptmr.c @@ -28,7 +28,7 @@ struct mcux_lptmr_data { static int mcux_lptmr_start(struct device *dev) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; LPTMR_EnableInterrupts(config->base, kLPTMR_TimerInterruptEnable); @@ -39,7 +39,7 @@ static int mcux_lptmr_start(struct device *dev) static int mcux_lptmr_stop(struct device *dev) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; LPTMR_DisableInterrupts(config->base, kLPTMR_TimerInterruptEnable); @@ -50,7 +50,7 @@ static int mcux_lptmr_stop(struct device *dev) static int mcux_lptmr_get_value(struct device *dev, uint32_t *ticks) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; *ticks = LPTMR_GetCurrentTimerCount(config->base); @@ -60,7 +60,7 @@ static int mcux_lptmr_get_value(struct device *dev, uint32_t *ticks) static int mcux_lptmr_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; struct mcux_lptmr_data *data = dev->driver_data; if (cfg->ticks == 0) { @@ -87,7 +87,7 @@ static int mcux_lptmr_set_top_value(struct device *dev, static uint32_t mcux_lptmr_get_pending_int(struct device *dev) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; uint32_t mask = LPTMR_CSR_TCF_MASK | LPTMR_CSR_TIE_MASK; uint32_t flags; @@ -98,7 +98,7 @@ static uint32_t mcux_lptmr_get_pending_int(struct device *dev) static uint32_t mcux_lptmr_get_top_value(struct device *dev) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; return (config->base->CMR & LPTMR_CMR_COMPARE_MASK) + 1U; } @@ -114,7 +114,7 @@ static uint32_t mcux_lptmr_get_max_relative_alarm(struct device *dev) static void mcux_lptmr_isr(void *arg) { struct device *dev = arg; - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; struct mcux_lptmr_data *data = dev->driver_data; uint32_t flags; @@ -128,7 +128,7 @@ static void mcux_lptmr_isr(void *arg) static int mcux_lptmr_init(struct device *dev) { - const struct mcux_lptmr_config *config = dev->config_info; + const struct mcux_lptmr_config *config = dev->config; lptmr_config_t lptmr_config; LPTMR_GetDefaultConfig(&lptmr_config); diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c index 768c4ead9b2..7342eea0281 100644 --- a/drivers/counter/counter_mcux_rtc.c +++ b/drivers/counter/counter_mcux_rtc.c @@ -28,7 +28,7 @@ struct mcux_rtc_config { static int mcux_rtc_start(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); @@ -43,7 +43,7 @@ static int mcux_rtc_start(struct device *dev) static int mcux_rtc_stop(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); @@ -61,7 +61,7 @@ static int mcux_rtc_stop(struct device *dev) static uint32_t mcux_rtc_read(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); @@ -90,7 +90,7 @@ static int mcux_rtc_get_value(struct device *dev, uint32_t *ticks) static int mcux_rtc_set_alarm(struct device *dev, uint8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); struct mcux_rtc_data *data = dev->driver_data; @@ -144,7 +144,7 @@ static int mcux_rtc_cancel_alarm(struct device *dev, uint8_t chan_id) static int mcux_rtc_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); struct mcux_rtc_data *data = dev->driver_data; @@ -168,7 +168,7 @@ static int mcux_rtc_set_top_value(struct device *dev, static uint32_t mcux_rtc_get_pending_int(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); @@ -177,14 +177,14 @@ static uint32_t mcux_rtc_get_pending_int(struct device *dev) static uint32_t mcux_rtc_get_top_value(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; return info->max_top_value; } static uint32_t mcux_rtc_get_max_relative_alarm(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; return info->max_top_value; } @@ -192,7 +192,7 @@ static uint32_t mcux_rtc_get_max_relative_alarm(struct device *dev) static void mcux_rtc_isr(void *arg) { struct device *dev = arg; - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); struct mcux_rtc_data *data = dev->driver_data; @@ -233,7 +233,7 @@ static void mcux_rtc_isr(void *arg) static int mcux_rtc_init(struct device *dev) { - const struct counter_config_info *info = dev->config_info; + const struct counter_config_info *info = dev->config; const struct mcux_rtc_config *config = CONTAINER_OF(info, struct mcux_rtc_config, info); rtc_config_t rtc_config; diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c index 5e37cc38ac9..b5fe2711d0b 100644 --- a/drivers/counter/counter_nrfx_rtc.c +++ b/drivers/counter/counter_nrfx_rtc.c @@ -74,7 +74,7 @@ static inline struct counter_nrfx_data *get_dev_data(struct device *dev) static inline const struct counter_nrfx_config *get_nrfx_config( struct device *dev) { - return CONTAINER_OF(dev->config_info, + return CONTAINER_OF(dev->config, struct counter_nrfx_config, info); } diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c index 2ec0937d617..c57f6c6d037 100644 --- a/drivers/counter/counter_nrfx_timer.c +++ b/drivers/counter/counter_nrfx_timer.c @@ -58,7 +58,7 @@ static inline struct counter_nrfx_data *get_dev_data(struct device *dev) static inline const struct counter_nrfx_config *get_nrfx_config( struct device *dev) { - return CONTAINER_OF(dev->config_info, + return CONTAINER_OF(dev->config, struct counter_nrfx_config, info); } diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c index a22269f31fe..116f9c78142 100644 --- a/drivers/counter/counter_sam0_tc32.c +++ b/drivers/counter/counter_sam0_tc32.c @@ -42,7 +42,7 @@ struct counter_sam0_tc32_config { }; #define DEV_CFG(dev) ((const struct counter_sam0_tc32_config *const) \ - (dev)->config_info) + (dev)->config) #define DEV_DATA(dev) ((struct counter_sam0_tc32_data *const) \ (dev)->driver_data) diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c index cbe8ac3ca59..904bc6bea38 100644 --- a/drivers/counter/maxim_ds3231.c +++ b/drivers/counter/maxim_ds3231.c @@ -149,7 +149,7 @@ static int sc_ctrl(struct device *dev, uint8_t clear) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; struct register_map *rp = &data->registers; uint8_t ctrl = (rp->ctrl & ~clear) | set; int rc = ctrl; @@ -201,7 +201,7 @@ static inline int rsc_stat(struct device *dev, uint8_t const ign = MAXIM_DS3231_REG_STAT_OSF | MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2; struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; struct register_map *rp = &data->registers; uint8_t addr = offsetof(struct register_map, ctrl_stat); int rc; @@ -248,7 +248,7 @@ int maxim_ds3231_stat_update(struct device *dev, static void validate_isw_monitoring(struct device *dev) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; const struct register_map *rp = &data->registers; uint8_t isw_mon_req = 0; @@ -449,7 +449,7 @@ static uint32_t decode_rtc(struct ds3231_data *data) static int update_registers(struct device *dev) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; uint32_t syncclock; int rc; uint8_t addr = 0; @@ -472,7 +472,7 @@ int maxim_ds3231_get_alarm(struct device *dev, struct maxim_ds3231_alarm *cp) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; int rv = 0; uint8_t addr; uint8_t len; @@ -529,7 +529,7 @@ static int ds3231_counter_cancel_alarm(struct device *dev, uint8_t id) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; int rv = 0; if (id >= cfg->generic.channels) { @@ -557,7 +557,7 @@ static int set_alarm(struct device *dev, const struct maxim_ds3231_alarm *cp) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; uint8_t addr; uint8_t len; @@ -672,7 +672,7 @@ static void alarm_worker(struct k_work *work) struct ds3231_data *data = CONTAINER_OF(work, struct ds3231_data, alarm_work); struct device *ds3231 = data->ds3231; - const struct ds3231_config *cfg = ds3231->config_info; + const struct ds3231_config *cfg = ds3231->config; k_sem_take(&data->lock, K_FOREVER); @@ -751,7 +751,7 @@ static int read_time(struct device *dev, time_t *time) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; uint8_t addr = 0; int rc = i2c_write_read(data->i2c, cfg->addr, @@ -886,7 +886,7 @@ static void sync_prep_write(struct device *dev) static void sync_finish_write(struct device *dev) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; time_t when = data->new_sp.rtc.tv_sec; struct tm tm; uint8_t buf[8]; @@ -1118,7 +1118,7 @@ out: static int ds3231_init(struct device *dev) { struct ds3231_data *data = dev->driver_data; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; struct device *i2c = device_get_binding(cfg->bus_name); int rc; @@ -1215,7 +1215,7 @@ int ds3231_counter_set_alarm(struct device *dev, { struct ds3231_data *data = dev->driver_data; const struct register_map *rp = &data->registers; - const struct ds3231_config *cfg = dev->config_info; + const struct ds3231_config *cfg = dev->config; time_t when; int rc = 0; diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c index 7fe3c2f3720..bf02554eb88 100644 --- a/drivers/counter/timer_dtmr_cmsdk_apb.c +++ b/drivers/counter/timer_dtmr_cmsdk_apb.c @@ -37,8 +37,7 @@ struct dtmr_cmsdk_apb_dev_data { static int dtmr_cmsdk_apb_start(struct device *dev) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; /* Set the timer reload to count */ @@ -52,8 +51,7 @@ static int dtmr_cmsdk_apb_start(struct device *dev) static int dtmr_cmsdk_apb_stop(struct device *dev) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; /* Disable the dualtimer */ cfg->dtimer->timer1ctrl = 0x0; @@ -63,8 +61,7 @@ static int dtmr_cmsdk_apb_stop(struct device *dev) static int dtmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; *ticks = data->load - cfg->dtimer->timer1value; @@ -74,8 +71,7 @@ static int dtmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks) static int dtmr_cmsdk_apb_set_top_value(struct device *dev, const struct counter_top_cfg *top_cfg) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; data->top_callback = top_cfg->callback; @@ -117,8 +113,7 @@ static uint32_t dtmr_cmsdk_apb_get_top_value(struct device *dev) static uint32_t dtmr_cmsdk_apb_get_pending_int(struct device *dev) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; return cfg->dtimer->timer1ris; } @@ -136,8 +131,7 @@ static void dtmr_cmsdk_apb_isr(void *arg) { struct device *dev = (struct device *)arg; struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; cfg->dtimer->timer1intclr = DUALTIMER_INTCLR; if (data->top_callback) { @@ -147,8 +141,7 @@ static void dtmr_cmsdk_apb_isr(void *arg) static int dtmr_cmsdk_apb_init(struct device *dev) { - const struct dtmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c index bdbc8086191..fe9393bc873 100644 --- a/drivers/counter/timer_tmr_cmsdk_apb.c +++ b/drivers/counter/timer_tmr_cmsdk_apb.c @@ -39,7 +39,7 @@ struct tmr_cmsdk_apb_dev_data { static int tmr_cmsdk_apb_start(struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; /* Set the timer reload to count */ @@ -53,7 +53,7 @@ static int tmr_cmsdk_apb_start(struct device *dev) static int tmr_cmsdk_apb_stop(struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; /* Disable the timer */ cfg->timer->ctrl = 0x0; @@ -63,7 +63,7 @@ static int tmr_cmsdk_apb_stop(struct device *dev) static int tmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; /* Get Counter Value */ @@ -75,7 +75,7 @@ static int tmr_cmsdk_apb_set_top_value(struct device *dev, const struct counter_top_cfg *top_cfg) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; /* Counter is always reset when top value is updated. */ @@ -113,7 +113,7 @@ static uint32_t tmr_cmsdk_apb_get_top_value(struct device *dev) static uint32_t tmr_cmsdk_apb_get_pending_int(struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; return cfg->timer->intstatus; } @@ -132,7 +132,7 @@ static void tmr_cmsdk_apb_isr(void *arg) struct device *dev = (struct device *)arg; struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; cfg->timer->intclear = TIMER_CTRL_INT_CLEAR; if (data->top_callback) { @@ -143,7 +143,7 @@ static void tmr_cmsdk_apb_isr(void *arg) static int tmr_cmsdk_apb_init(struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = - dev->config_info; + dev->config; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c index ec76fc01a27..20be1563692 100644 --- a/drivers/crypto/crypto_ataes132a.c +++ b/drivers/crypto/crypto_ataes132a.c @@ -44,7 +44,7 @@ static int ataes132a_send_command(struct device *dev, uint8_t opcode, { int retry_count = 0; struct ataes132a_device_data *data = dev->driver_data; - const struct ataes132a_device_config *cfg = dev->config_info; + const struct ataes132a_device_config *cfg = dev->config; uint8_t count; uint8_t status; uint8_t crc[2]; @@ -167,7 +167,7 @@ static int ataes132a_send_command(struct device *dev, uint8_t opcode, int ataes132a_init(struct device *dev) { struct ataes132a_device_data *ataes132a = dev->driver_data; - const struct ataes132a_device_config *cfg = dev->config_info; + const struct ataes132a_device_config *cfg = dev->config; uint32_t i2c_cfg; LOG_DBG("ATAES132A INIT"); @@ -798,7 +798,7 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx, { uint8_t key_id = *((uint8_t *)ctx->key.handle); struct ataes132a_device_data *data = dev->driver_data; - const struct ataes132a_device_config *cfg = dev->config_info; + const struct ataes132a_device_config *cfg = dev->config; uint8_t config; if (ataes132a_state[key_id].in_use) { diff --git a/drivers/crypto/crypto_stm32_priv.h b/drivers/crypto/crypto_stm32_priv.h index 4f1455b181f..97748072ad8 100644 --- a/drivers/crypto/crypto_stm32_priv.h +++ b/drivers/crypto/crypto_stm32_priv.h @@ -28,7 +28,7 @@ struct crypto_stm32_session { }; #define CRYPTO_STM32_CFG(dev) \ - ((const struct crypto_stm32_config *const)(dev)->config_info) + ((const struct crypto_stm32_config *const)(dev)->config) #define CRYPTO_STM32_DATA(dev) \ ((struct crypto_stm32_data *const)(dev)->driver_data) diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c index dcfc582d773..64144cf32ba 100644 --- a/drivers/dac/dac_mcux_dac.c +++ b/drivers/dac/dac_mcux_dac.c @@ -27,7 +27,7 @@ struct mcux_dac_data { static int mcux_dac_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { - const struct mcux_dac_config *config = dev->config_info; + const struct mcux_dac_config *config = dev->config; struct mcux_dac_data *data = dev->driver_data; dac_config_t dac_config; @@ -54,7 +54,7 @@ static int mcux_dac_channel_setup(struct device *dev, static int mcux_dac_write_value(struct device *dev, uint8_t channel, uint32_t value) { - const struct mcux_dac_config *config = dev->config_info; + const struct mcux_dac_config *config = dev->config; struct mcux_dac_data *data = dev->driver_data; if (!data->configured) { diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c index 424872c1fd4..758e9fbc8eb 100644 --- a/drivers/dac/dac_mcux_dac32.c +++ b/drivers/dac/dac_mcux_dac32.c @@ -28,7 +28,7 @@ struct mcux_dac32_data { static int mcux_dac32_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { - const struct mcux_dac32_config *config = dev->config_info; + const struct mcux_dac32_config *config = dev->config; struct mcux_dac32_data *data = dev->driver_data; dac32_config_t dac32_config; @@ -59,7 +59,7 @@ static int mcux_dac32_channel_setup(struct device *dev, static int mcux_dac32_write_value(struct device *dev, uint8_t channel, uint32_t value) { - const struct mcux_dac32_config *config = dev->config_info; + const struct mcux_dac32_config *config = dev->config; struct mcux_dac32_data *data = dev->driver_data; if (!data->configured) { diff --git a/drivers/dac/dac_sam0.c b/drivers/dac/dac_sam0.c index 62393bff0a3..a62cb67cc37 100644 --- a/drivers/dac/dac_sam0.c +++ b/drivers/dac/dac_sam0.c @@ -28,7 +28,7 @@ struct dac_sam0_cfg { uint8_t refsel; }; -#define DEV_CFG(dev) ((const struct dac_sam0_cfg *const)(dev)->config_info) +#define DEV_CFG(dev) ((const struct dac_sam0_cfg *const)(dev)->config) /* Write to the DAC. */ static int dac_sam0_write_value(struct device *dev, uint8_t channel, diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c index f7f8cbccb35..c88a21020b1 100644 --- a/drivers/dac/dac_stm32.c +++ b/drivers/dac/dac_stm32.c @@ -54,7 +54,7 @@ static int dac_stm32_write_value(struct device *dev, uint8_t channel, uint32_t value) { struct dac_stm32_data *data = dev->driver_data; - const struct dac_stm32_cfg *cfg = dev->config_info; + const struct dac_stm32_cfg *cfg = dev->config; if (channel - STM32_FIRST_CHANNEL >= data->channel_count || channel < STM32_FIRST_CHANNEL) { @@ -77,7 +77,7 @@ static int dac_stm32_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { struct dac_stm32_data *data = dev->driver_data; - const struct dac_stm32_cfg *cfg = dev->config_info; + const struct dac_stm32_cfg *cfg = dev->config; if ((channel_cfg->channel_id - STM32_FIRST_CHANNEL >= data->channel_count) || @@ -109,7 +109,7 @@ static int dac_stm32_channel_setup(struct device *dev, static int dac_stm32_init(struct device *dev) { - const struct dac_stm32_cfg *cfg = dev->config_info; + const struct dac_stm32_cfg *cfg = dev->config; /* enable clock for subsystem */ struct device *clk = diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c index 34e707aa370..4b62148dc14 100644 --- a/drivers/display/display_mcux_elcdif.c +++ b/drivers/display/display_mcux_elcdif.c @@ -44,7 +44,7 @@ static int mcux_elcdif_write(const struct device *dev, const uint16_t x, const struct display_buffer_descriptor *desc, const void *buf) { - const struct mcux_elcdif_config *config = dev->config_info; + const struct mcux_elcdif_config *config = dev->config; struct mcux_elcdif_data *data = dev->driver_data; uint8_t write_idx = data->write_idx; @@ -132,7 +132,7 @@ static int mcux_elcdif_set_pixel_format(const struct device *dev, const enum display_pixel_format pixel_format) { - const struct mcux_elcdif_config *config = dev->config_info; + const struct mcux_elcdif_config *config = dev->config; if (pixel_format == config->pixel_format) { return 0; @@ -154,7 +154,7 @@ static int mcux_elcdif_set_orientation(const struct device *dev, static void mcux_elcdif_get_capabilities(const struct device *dev, struct display_capabilities *capabilities) { - const struct mcux_elcdif_config *config = dev->config_info; + const struct mcux_elcdif_config *config = dev->config; memset(capabilities, 0, sizeof(struct display_capabilities)); capabilities->x_resolution = config->rgb_mode.panelWidth; @@ -167,7 +167,7 @@ static void mcux_elcdif_get_capabilities(const struct device *dev, static void mcux_elcdif_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_elcdif_config *config = dev->config_info; + const struct mcux_elcdif_config *config = dev->config; struct mcux_elcdif_data *data = dev->driver_data; uint32_t status; @@ -179,7 +179,7 @@ static void mcux_elcdif_isr(void *arg) static int mcux_elcdif_init(struct device *dev) { - const struct mcux_elcdif_config *config = dev->config_info; + const struct mcux_elcdif_config *config = dev->config; struct mcux_elcdif_data *data = dev->driver_data; int i; diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c index 8d1be4537ad..e21277d0c9c 100644 --- a/drivers/display/grove_lcd_rgb.c +++ b/drivers/display/grove_lcd_rgb.c @@ -105,7 +105,7 @@ static inline void sleep(uint32_t sleep_in_ms) void glcd_print(struct device *port, char *data, uint32_t size) { const struct glcd_driver * const rom = (const struct glcd_driver *) - port->config_info; + port->config; struct glcd_data *dev = port->driver_data; uint8_t buf[] = { GLCD_CMD_SET_CGRAM_ADDR, 0 }; int i; @@ -120,7 +120,7 @@ void glcd_print(struct device *port, char *data, uint32_t size) void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row) { const struct glcd_driver * const rom = (const struct glcd_driver *) - port->config_info; + port->config; struct glcd_data *dev = port->driver_data; unsigned char data[2]; @@ -141,7 +141,7 @@ void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row) void glcd_clear(struct device *port) { const struct glcd_driver * const rom = (const struct glcd_driver *) - port->config_info; + port->config; struct glcd_data *dev = port->driver_data; uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR }; @@ -154,7 +154,7 @@ void glcd_clear(struct device *port) void glcd_display_state_set(struct device *port, uint8_t opt) { const struct glcd_driver * const rom = (const struct glcd_driver *) - port->config_info; + port->config; struct glcd_data *dev = port->driver_data; uint8_t data[] = { 0, 0 }; @@ -178,7 +178,7 @@ uint8_t glcd_display_state_get(struct device *port) void glcd_input_state_set(struct device *port, uint8_t opt) { - const struct glcd_driver * const rom = port->config_info; + const struct glcd_driver * const rom = port->config; struct glcd_data *dev = port->driver_data; uint8_t data[] = { 0, 0 }; @@ -223,7 +223,7 @@ void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b) void glcd_function_set(struct device *port, uint8_t opt) { - const struct glcd_driver * const rom = port->config_info; + const struct glcd_driver * const rom = port->config; struct glcd_data *dev = port->driver_data; uint8_t data[] = { 0, 0 }; diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c index 2e6743ce18d..e30bf782a06 100644 --- a/drivers/dma/dma_dw.c +++ b/drivers/dma/dma_dw.c @@ -37,7 +37,7 @@ LOG_MODULE_REGISTER(dma_dw); #define DEV_NAME(dev) ((dev)->name) #define DEV_DATA(dev) ((struct dw_dma_dev_data *const)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct dw_dma_dev_cfg *const)(dev)->config_info) + ((const struct dw_dma_dev_cfg *const)(dev)->config) /* number of tries to wait for reset */ #define DW_DMA_CFG_TRIES 10000 diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c index 3cda2d69662..e28387ab16a 100644 --- a/drivers/dma/dma_mcux_edma.c +++ b/drivers/dma/dma_mcux_edma.c @@ -49,7 +49,7 @@ struct dma_mcux_edma_data { }; #define DEV_CFG(dev) \ - ((const struct dma_mcux_edma_config *const)dev->config_info) + ((const struct dma_mcux_edma_config *const)dev->config) #define DEV_DATA(dev) ((struct dma_mcux_edma_data *)dev->driver_data) #define DEV_BASE(dev) ((DMA_Type *)DEV_CFG(dev)->base) diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c index 625bb6ae25c..9edd63a8ead 100644 --- a/drivers/dma/dma_nios2_msgdma.c +++ b/drivers/dma/dma_nios2_msgdma.c @@ -31,7 +31,7 @@ struct nios2_msgdma_dev_cfg { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((struct nios2_msgdma_dev_cfg *)(dev)->config_info) + ((struct nios2_msgdma_dev_cfg *)(dev)->config) static void nios2_msgdma_isr(void *arg) { diff --git a/drivers/dma/dma_pl330.c b/drivers/dma/dma_pl330.c index 29afc425df4..fcaf58d6fb3 100644 --- a/drivers/dma/dma_pl330.c +++ b/drivers/dma/dma_pl330.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(dma_pl330); #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct dma_pl330_config *const)(dev)->config_info) + ((const struct dma_pl330_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct dma_pl330_dev_data *const)(dev)->driver_data) diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c index bf41013bb01..c4d6b4fc12a 100644 --- a/drivers/dma/dma_sam_xdmac.c +++ b/drivers/dma/dma_sam_xdmac.c @@ -47,7 +47,7 @@ struct sam_xdmac_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct sam_xdmac_dev_cfg *const)(dev)->config_info) + ((const struct sam_xdmac_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct sam_xdmac_dev_data *const)(dev)->driver_data) diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c index 60d9be6c42b..c6c58b40818 100644 --- a/drivers/dma/dma_stm32.c +++ b/drivers/dma/dma_stm32.c @@ -38,7 +38,7 @@ static uint32_t table_p_size[] = { static void dma_stm32_dump_stream_irq(struct device *dev, uint32_t id) { - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); stm32_dma_dump_stream_irq(dma, id); @@ -46,7 +46,7 @@ static void dma_stm32_dump_stream_irq(struct device *dev, uint32_t id) static void dma_stm32_clear_stream_irq(struct device *dev, uint32_t id) { - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); func_ll_clear_tc[id](dma); @@ -58,7 +58,7 @@ static void dma_stm32_irq_handler(void *arg) { struct device *dev = arg; struct dma_stm32_data *data = dev->driver_data; - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); struct dma_stm32_stream *stream; int id; @@ -243,7 +243,7 @@ static int dma_stm32_configure(struct device *dev, uint32_t id, struct dma_stm32_data *data = dev->driver_data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; const struct dma_stm32_config *dev_config = - dev->config_info; + dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)dev_config->base; LL_DMA_InitTypeDef DMA_InitStruct; uint32_t msize; @@ -477,7 +477,7 @@ static int dma_stm32_reload(struct device *dev, uint32_t id, uint32_t src, uint32_t dst, size_t size) #endif /* CONFIG_DMAMUX_STM32 */ { - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); struct dma_stm32_data *data = dev->driver_data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; @@ -524,7 +524,7 @@ int dma_stm32_start(struct device *dev, uint32_t id) static int dma_stm32_start(struct device *dev, uint32_t id) #endif /* CONFIG_DMAMUX_STM32 */ { - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); struct dma_stm32_data *data = dev->driver_data; @@ -552,7 +552,7 @@ static int dma_stm32_stop(struct device *dev, uint32_t id) struct dma_stm32_data *data = dev->driver_data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; const struct dma_stm32_config *config = - dev->config_info; + dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); /* give channel from index 0 */ @@ -583,7 +583,7 @@ struct k_mem_block block; static int dma_stm32_init(struct device *dev) { struct dma_stm32_data *data = dev->driver_data; - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); @@ -623,7 +623,7 @@ static int dma_stm32_init(struct device *dev) static int dma_stm32_get_status(struct device *dev, uint32_t id, struct dma_status *stat) { - const struct dma_stm32_config *config = dev->config_info; + const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); struct dma_stm32_data *data = dev->driver_data; struct dma_stm32_stream *stream; diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c index 4c9c67802e2..3060f2bcbb4 100644 --- a/drivers/dma/dmamux_stm32.c +++ b/drivers/dma/dmamux_stm32.c @@ -30,8 +30,7 @@ int dmamux_stm32_configure(struct device *dev, uint32_t id, { /* device is the dmamux, id is the dmamux channel from 0 */ struct dmamux_stm32_data *data = dev->driver_data; - const struct dmamux_stm32_config *dev_config = - dev->config_info; + const struct dmamux_stm32_config *dev_config = dev->config; /* * request line ID for this mux channel is stored @@ -78,8 +77,7 @@ int dmamux_stm32_configure(struct device *dev, uint32_t id, int dmamux_stm32_start(struct device *dev, uint32_t id) { - const struct dmamux_stm32_config *dev_config = - dev->config_info; + const struct dmamux_stm32_config *dev_config = dev->config; struct dmamux_stm32_data *data = dev->driver_data; /* check if this channel is valid */ @@ -99,8 +97,7 @@ int dmamux_stm32_start(struct device *dev, uint32_t id) int dmamux_stm32_stop(struct device *dev, uint32_t id) { - const struct dmamux_stm32_config *dev_config = - dev->config_info; + const struct dmamux_stm32_config *dev_config = dev->config; struct dmamux_stm32_data *data = dev->driver_data; /* check if this channel is valid */ @@ -121,8 +118,7 @@ int dmamux_stm32_stop(struct device *dev, uint32_t id) int dmamux_stm32_reload(struct device *dev, uint32_t id, uint32_t src, uint32_t dst, size_t size) { - const struct dmamux_stm32_config *dev_config = - dev->config_info; + const struct dmamux_stm32_config *dev_config = dev->config; struct dmamux_stm32_data *data = dev->driver_data; /* check if this channel is valid */ @@ -144,8 +140,7 @@ int dmamux_stm32_reload(struct device *dev, uint32_t id, static int dmamux_stm32_init(struct device *dev) { struct dmamux_stm32_data *data = dev->driver_data; - const struct dmamux_stm32_config *config = - dev->config_info; + const struct dmamux_stm32_config *config = dev->config; struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); diff --git a/drivers/eeprom/eeprom_at2x.c b/drivers/eeprom/eeprom_at2x.c index 1a18e81538e..488bb18076d 100644 --- a/drivers/eeprom/eeprom_at2x.c +++ b/drivers/eeprom/eeprom_at2x.c @@ -65,7 +65,7 @@ struct eeprom_at2x_data { static inline int eeprom_at2x_write_protect(struct device *dev) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; if (!data->wp_gpio_dev) { @@ -77,7 +77,7 @@ static inline int eeprom_at2x_write_protect(struct device *dev) static inline int eeprom_at2x_write_enable(struct device *dev) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; if (!data->wp_gpio_dev) { @@ -90,7 +90,7 @@ static inline int eeprom_at2x_write_enable(struct device *dev) static int eeprom_at2x_read(struct device *dev, off_t offset, void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; int err; @@ -118,7 +118,7 @@ static int eeprom_at2x_read(struct device *dev, off_t offset, void *buf, static size_t eeprom_at2x_limit_write_count(struct device *dev, off_t offset, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; size_t count = len; off_t page_boundary; @@ -139,7 +139,7 @@ static size_t eeprom_at2x_limit_write_count(struct device *dev, off_t offset, static int eeprom_at2x_write(struct device *dev, off_t offset, const void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; const uint8_t *pbuf = buf; int ret; @@ -193,7 +193,7 @@ static int eeprom_at2x_write(struct device *dev, off_t offset, const void *buf, static size_t eeprom_at2x_size(struct device *dev) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; return config->size; } @@ -202,7 +202,7 @@ static size_t eeprom_at2x_size(struct device *dev) static int eeprom_at24_read(struct device *dev, off_t offset, void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; int64_t timeout; uint8_t addr[2]; @@ -236,7 +236,7 @@ static int eeprom_at24_read(struct device *dev, off_t offset, void *buf, static int eeprom_at24_write(struct device *dev, off_t offset, const void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; int count = eeprom_at2x_limit_write_count(dev, offset, len); uint8_t block[config->addr_width / 8 + count]; @@ -313,7 +313,7 @@ static int eeprom_at25_rdsr(struct device *dev, uint8_t *status) static int eeprom_at25_wait_for_idle(struct device *dev) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; int64_t timeout; uint8_t status; int err; @@ -342,7 +342,7 @@ static int eeprom_at25_wait_for_idle(struct device *dev) static int eeprom_at25_read(struct device *dev, off_t offset, void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; size_t cmd_len = 1 + config->addr_width / 8; uint8_t cmd[4] = { EEPROM_AT25_READ, 0, 0, 0 }; @@ -424,7 +424,7 @@ static int eeprom_at25_wren(struct device *dev) static int eeprom_at25_write(struct device *dev, off_t offset, const void *buf, size_t len) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; int count = eeprom_at2x_limit_write_count(dev, offset, len); uint8_t cmd[4] = { EEPROM_AT25_WRITE, 0, 0, 0 }; @@ -484,7 +484,7 @@ static int eeprom_at25_write(struct device *dev, off_t offset, static int eeprom_at2x_init(struct device *dev) { - const struct eeprom_at2x_config *config = dev->config_info; + const struct eeprom_at2x_config *config = dev->config; struct eeprom_at2x_data *data = dev->driver_data; int err; diff --git a/drivers/eeprom/eeprom_lpc11u6x.c b/drivers/eeprom/eeprom_lpc11u6x.c index 6a1276ef6c6..b1786e2d694 100644 --- a/drivers/eeprom/eeprom_lpc11u6x.c +++ b/drivers/eeprom/eeprom_lpc11u6x.c @@ -30,7 +30,7 @@ struct eeprom_lpc11u6x_config { static int eeprom_lpc11u6x_read(struct device *dev, off_t offset, void *data, size_t len) { - const struct eeprom_lpc11u6x_config *config = dev->config_info; + const struct eeprom_lpc11u6x_config *config = dev->config; uint32_t cmd[5]; int ret; @@ -63,7 +63,7 @@ static int eeprom_lpc11u6x_read(struct device *dev, static int eeprom_lpc11u6x_write(struct device *dev, off_t offset, const void *data, size_t len) { - const struct eeprom_lpc11u6x_config *config = dev->config_info; + const struct eeprom_lpc11u6x_config *config = dev->config; uint32_t cmd[5]; int ret; @@ -95,7 +95,7 @@ static int eeprom_lpc11u6x_write(struct device *dev, static size_t eeprom_lpc11u6x_size(struct device *dev) { - const struct eeprom_lpc11u6x_config *config = dev->config_info; + const struct eeprom_lpc11u6x_config *config = dev->config; return config->size; } diff --git a/drivers/eeprom/eeprom_simulator.c b/drivers/eeprom/eeprom_simulator.c index bf80bd00497..b47f4409d3a 100644 --- a/drivers/eeprom/eeprom_simulator.c +++ b/drivers/eeprom/eeprom_simulator.c @@ -36,7 +36,7 @@ struct eeprom_sim_config { }; #define DEV_NAME(dev) ((dev)->name) -#define DEV_CONFIG(dev) ((dev)->config_info) +#define DEV_CONFIG(dev) ((dev)->config) #define EEPROM(addr) (mock_eeprom + (addr)) diff --git a/drivers/eeprom/eeprom_stm32.c b/drivers/eeprom/eeprom_stm32.c index 128afe96dc7..52ac53d5be2 100644 --- a/drivers/eeprom/eeprom_stm32.c +++ b/drivers/eeprom/eeprom_stm32.c @@ -23,7 +23,7 @@ struct eeprom_stm32_config { static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf, size_t len) { - const struct eeprom_stm32_config *config = dev->config_info; + const struct eeprom_stm32_config *config = dev->config; uint8_t *pbuf = buf; if (!len) { @@ -53,7 +53,7 @@ static int eeprom_stm32_read(struct device *dev, off_t offset, void *buf, static int eeprom_stm32_write(struct device *dev, off_t offset, const void *buf, size_t len) { - const struct eeprom_stm32_config *config = dev->config_info; + const struct eeprom_stm32_config *config = dev->config; const uint8_t *pbuf = buf; HAL_StatusTypeDef ret = HAL_OK; @@ -100,7 +100,7 @@ static int eeprom_stm32_write(struct device *dev, off_t offset, static size_t eeprom_stm32_size(struct device *dev) { - const struct eeprom_stm32_config *config = dev->config_info; + const struct eeprom_stm32_config *config = dev->config; return config->size; } diff --git a/drivers/entropy/entropy_mcux_rng.c b/drivers/entropy/entropy_mcux_rng.c index 9f5c9476bef..58de190d8ca 100644 --- a/drivers/entropy/entropy_mcux_rng.c +++ b/drivers/entropy/entropy_mcux_rng.c @@ -20,7 +20,7 @@ struct mcux_entropy_config { static int entropy_mcux_rng_get_entropy(struct device *dev, uint8_t *buffer, uint16_t length) { - const struct mcux_entropy_config *config = dev->config_info; + const struct mcux_entropy_config *config = dev->config; status_t status; ARG_UNUSED(dev); diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c index e8960d2130d..bb015a4f3a2 100644 --- a/drivers/entropy/entropy_mcux_trng.c +++ b/drivers/entropy/entropy_mcux_trng.c @@ -20,7 +20,7 @@ struct mcux_entropy_config { static int entropy_mcux_trng_get_entropy(struct device *dev, uint8_t *buffer, uint16_t length) { - const struct mcux_entropy_config *config = dev->config_info; + const struct mcux_entropy_config *config = dev->config; status_t status; ARG_UNUSED(dev); @@ -48,7 +48,7 @@ DEVICE_AND_API_INIT(entropy_mcux_trng, DT_INST_LABEL(0), static int entropy_mcux_trng_init(struct device *dev) { - const struct mcux_entropy_config *config = dev->config_info; + const struct mcux_entropy_config *config = dev->config; trng_config_t conf; status_t status; diff --git a/drivers/entropy/entropy_rv32m1_trng.c b/drivers/entropy/entropy_rv32m1_trng.c index b96e94be122..e3b01822290 100644 --- a/drivers/entropy/entropy_rv32m1_trng.c +++ b/drivers/entropy/entropy_rv32m1_trng.c @@ -20,7 +20,7 @@ struct rv32m1_entropy_config { static int entropy_rv32m1_trng_get_entropy(struct device *dev, uint8_t *buffer, uint16_t length) { - const struct rv32m1_entropy_config *config = dev->config_info; + const struct rv32m1_entropy_config *config = dev->config; status_t status; ARG_UNUSED(dev); @@ -48,7 +48,7 @@ DEVICE_AND_API_INIT(entropy_rv32m1_trng, DT_INST_LABEL(0), static int entropy_rv32m1_trng_init(struct device *dev) { - const struct rv32m1_entropy_config *config = dev->config_info; + const struct rv32m1_entropy_config *config = dev->config; trng_config_t conf; status_t status; diff --git a/drivers/entropy/entropy_sam.c b/drivers/entropy/entropy_sam.c index 7cdb25e2b5d..59f56d1a273 100644 --- a/drivers/entropy/entropy_sam.c +++ b/drivers/entropy/entropy_sam.c @@ -18,7 +18,7 @@ struct trng_sam_dev_cfg { }; #define DEV_CFG(dev) \ - ((const struct trng_sam_dev_cfg *const)(dev)->config_info) + ((const struct trng_sam_dev_cfg *const)(dev)->config) static inline bool _ready(Trng * const trng) { diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c index e50f95e8e90..6a49136f4ec 100644 --- a/drivers/entropy/entropy_stm32.c +++ b/drivers/entropy/entropy_stm32.c @@ -32,7 +32,7 @@ struct entropy_stm32_rng_dev_data { ((struct entropy_stm32_rng_dev_data *)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct entropy_stm32_rng_dev_cfg *)(dev)->config_info) + ((const struct entropy_stm32_rng_dev_cfg *)(dev)->config) static void entropy_stm32_rng_reset(RNG_TypeDef *rng) { diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c index 4c346047e66..a9df2465a6d 100644 --- a/drivers/espi/espi_mchp_xec.c +++ b/drivers/espi/espi_mchp_xec.c @@ -360,7 +360,7 @@ static int espi_xec_write_lpc_request(struct device *dev, uint32_t *data) { struct espi_xec_config *config = - (struct espi_xec_config *) (dev->config_info); + (struct espi_xec_config *) (dev->config); volatile uint32_t __attribute__((unused)) dummy; @@ -678,7 +678,7 @@ static void send_slave_bootdone(struct device *dev) static void espi_init_oob(struct device *dev) { struct espi_xec_config *config = - (struct espi_xec_config *) (dev->config_info); + (struct espi_xec_config *) (dev->config); /* Enable OOB Tx/Rx interrupts */ MCHP_GIRQ_ENSET(config->bus_girq_id) = (MCHP_ESPI_OOB_UP_GIRQ_VAL | @@ -700,7 +700,7 @@ static void espi_init_oob(struct device *dev) static void espi_init_flash(struct device *dev) { struct espi_xec_config *config = - (struct espi_xec_config *)(dev->config_info); + (struct espi_xec_config *)(dev->config); LOG_DBG("%s", __func__); @@ -713,7 +713,7 @@ static void espi_init_flash(struct device *dev) static void espi_bus_init(struct device *dev) { - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; /* Enable bus interrupts */ MCHP_GIRQ_ENSET(config->bus_girq_id) = MCHP_ESPI_ESPI_RST_GIRQ_VAL | @@ -858,7 +858,7 @@ static void espi_pc_isr(struct device *dev) static void espi_vwire_chanel_isr(struct device *dev) { struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; struct espi_event evt = { .evt_type = ESPI_BUS_EVENT_CHANNEL_READY, .evt_details = ESPI_CHANNEL_VWIRE, .evt_data = 0 }; @@ -1198,7 +1198,7 @@ static uint8_t periph_isr_cnt = sizeof(peripherals_isr) / sizeof(struct espi_isr static void espi_xec_bus_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; uint32_t girq_result; girq_result = MCHP_GIRQ_RESULT(config->bus_girq_id); @@ -1219,7 +1219,7 @@ static void espi_xec_bus_isr(void *arg) static void espi_xec_vw_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; uint32_t girq_result; girq_result = MCHP_GIRQ_RESULT(config->vw_girq_id); @@ -1240,7 +1240,7 @@ static void espi_xec_vw_isr(void *arg) static void espi_xec_periph_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; uint32_t girq_result; girq_result = MCHP_GIRQ_RESULT(config->pc_girq_id); @@ -1290,7 +1290,7 @@ DEVICE_AND_API_INIT(espi_xec_0, DT_INST_LABEL(0), static int espi_xec_init(struct device *dev) { - const struct espi_xec_config *config = dev->config_info; + const struct espi_xec_config *config = dev->config; struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); data->plt_rst_asserted = 0; diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c index 3da51f820b7..4bb515a5927 100644 --- a/drivers/ethernet/eth_enc28j60.c +++ b/drivers/ethernet/eth_enc28j60.c @@ -349,7 +349,7 @@ static void eth_enc28j60_init_buffers(struct device *dev) static void eth_enc28j60_init_mac(struct device *dev) { - const struct eth_enc28j60_config *config = dev->config_info; + const struct eth_enc28j60_config *config = dev->config; struct eth_enc28j60_runtime *context = dev->driver_data; uint8_t data_macon; @@ -399,7 +399,7 @@ static void eth_enc28j60_init_mac(struct device *dev) static void eth_enc28j60_init_phy(struct device *dev) { - const struct eth_enc28j60_config *config = dev->config_info; + const struct eth_enc28j60_config *config = dev->config; if (config->full_duplex) { eth_enc28j60_write_phy(dev, ENC28J60_PHY_PHCON1, @@ -506,7 +506,7 @@ static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt) static int eth_enc28j60_rx(struct device *dev, uint16_t *vlan_tag) { - const struct eth_enc28j60_config *config = dev->config_info; + const struct eth_enc28j60_config *config = dev->config; struct eth_enc28j60_runtime *context = dev->driver_data; uint16_t lengthfr; uint8_t counter; @@ -717,7 +717,7 @@ static const struct ethernet_api api_funcs = { static int eth_enc28j60_init(struct device *dev) { - const struct eth_enc28j60_config *config = dev->config_info; + const struct eth_enc28j60_config *config = dev->config; struct eth_enc28j60_runtime *context = dev->driver_data; /* SPI config */ diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c index 485c3215390..70a050d6f43 100644 --- a/drivers/ethernet/eth_enc424j600.c +++ b/drivers/ethernet/eth_enc424j600.c @@ -344,7 +344,7 @@ static int enc424j600_tx(struct device *dev, struct net_pkt *pkt) static int enc424j600_rx(struct device *dev) { struct enc424j600_runtime *context = dev->driver_data; - const struct enc424j600_config *config = dev->config_info; + const struct enc424j600_config *config = dev->config; uint8_t info[ENC424J600_RSV_SIZE + ENC424J600_PTR_NXP_PKT_SIZE]; struct net_buf *pkt_buf = NULL; struct net_pkt *pkt; @@ -596,7 +596,7 @@ static const struct ethernet_api api_funcs = { static int enc424j600_init(struct device *dev) { - const struct enc424j600_config *config = dev->config_info; + const struct enc424j600_config *config = dev->config; struct enc424j600_runtime *context = dev->driver_data; uint8_t retries = ENC424J600_DEFAULT_NUMOF_RETRIES; uint16_t tmp; diff --git a/drivers/ethernet/eth_gecko_priv.h b/drivers/ethernet/eth_gecko_priv.h index e7eaed5989d..c5a1f43c4b4 100644 --- a/drivers/ethernet/eth_gecko_priv.h +++ b/drivers/ethernet/eth_gecko_priv.h @@ -96,7 +96,7 @@ struct eth_gecko_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct eth_gecko_dev_cfg *)(dev)->config_info) + ((const struct eth_gecko_dev_cfg *)(dev)->config) #define DEV_DATA(dev) \ ((struct eth_gecko_dev_data *)(dev)->driver_data) diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c index d00bf427b35..a89338b96f8 100644 --- a/drivers/ethernet/eth_liteeth.c +++ b/drivers/ethernet/eth_liteeth.c @@ -74,7 +74,7 @@ struct eth_liteeth_config { static int eth_initialize(struct device *dev) { - const struct eth_liteeth_config *config = dev->config_info; + const struct eth_liteeth_config *config = dev->config; config->config_func(); diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h index e76b180b4f8..d061ee2cb7a 100644 --- a/drivers/ethernet/eth_sam_gmac_priv.h +++ b/drivers/ethernet/eth_sam_gmac_priv.h @@ -281,7 +281,7 @@ struct eth_sam_dev_data { }; #define DEV_CFG(dev) \ - ((const struct eth_sam_dev_cfg *const)(dev)->config_info) + ((const struct eth_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct eth_sam_dev_data *const)(dev)->driver_data) diff --git a/drivers/ethernet/eth_stellaris_priv.h b/drivers/ethernet/eth_stellaris_priv.h index c0d523ca747..8b31a62ce89 100644 --- a/drivers/ethernet/eth_stellaris_priv.h +++ b/drivers/ethernet/eth_stellaris_priv.h @@ -11,7 +11,7 @@ #define DEV_DATA(dev) \ ((struct eth_stellaris_runtime *)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct eth_stellaris_config *const)(dev)->config_info) + ((const struct eth_stellaris_config *const)(dev)->config) /* * Register mapping */ diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h index 511a6af331f..2ef66c658fc 100644 --- a/drivers/ethernet/eth_stm32_hal_priv.h +++ b/drivers/ethernet/eth_stm32_hal_priv.h @@ -47,7 +47,7 @@ struct eth_stm32_hal_dev_data { }; #define DEV_CFG(dev) \ - ((const struct eth_stm32_hal_dev_cfg *)(dev)->config_info) + ((const struct eth_stm32_hal_dev_cfg *)(dev)->config) #define DEV_DATA(dev) \ ((struct eth_stm32_hal_dev_data *)(dev)->driver_data) diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c index 3057ed038cc..9982044ece4 100644 --- a/drivers/flash/flash_sam.c +++ b/drivers/flash/flash_sam.c @@ -52,7 +52,7 @@ static const struct flash_parameters flash_sam_parameters = { }; #define DEV_CFG(dev) \ - ((const struct flash_sam_dev_cfg *const)(dev)->config_info) + ((const struct flash_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct flash_sam_dev_data *const)(dev)->driver_data) diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c index 395099f594e..e666d115d81 100644 --- a/drivers/flash/nrf_qspi_nor.c +++ b/drivers/flash/nrf_qspi_nor.c @@ -330,7 +330,7 @@ static int qspi_erase(struct device *dev, uint32_t addr, uint32_t size) } int rv = 0; - const struct qspi_nor_config *params = dev->config_info; + const struct qspi_nor_config *params = dev->config; qspi_lock(dev); while ((rv == 0) && (size > 0)) { @@ -587,7 +587,7 @@ static int qspi_nor_read(struct device *dev, off_t addr, void *dest, return 0; } - const struct qspi_nor_config *params = dev->config_info; + const struct qspi_nor_config *params = dev->config; /* affected region should be within device */ if (addr < 0 || @@ -687,7 +687,7 @@ static int qspi_nor_write(struct device *dev, off_t addr, const void *src, } struct qspi_nor_data *const driver_data = dev->driver_data; - const struct qspi_nor_config *params = dev->config_info; + const struct qspi_nor_config *params = dev->config; if (driver_data->write_protection) { return -EACCES; @@ -723,7 +723,7 @@ static int qspi_nor_write(struct device *dev, off_t addr, const void *src, static int qspi_nor_erase(struct device *dev, off_t addr, size_t size) { struct qspi_nor_data *const driver_data = dev->driver_data; - const struct qspi_nor_config *params = dev->config_info; + const struct qspi_nor_config *params = dev->config; if (driver_data->write_protection) { return -EACCES; @@ -771,7 +771,7 @@ static int qspi_nor_write_protection_set(struct device *dev, */ static int qspi_nor_configure(struct device *dev) { - const struct qspi_nor_config *params = dev->config_info; + const struct qspi_nor_config *params = dev->config; int ret = qspi_nrfx_configure(dev); diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index 2c24cd33163..61133e7aa23 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -90,7 +90,7 @@ static struct spi_flash_at45_data *get_dev_data(struct device *dev) static const struct spi_flash_at45_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static void acquire(struct device *dev) diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index 03a9b969ee5..51cbe7a8db9 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -321,7 +321,7 @@ static int spi_nor_wait_until_ready(struct device *dev) static int spi_nor_read(struct device *dev, off_t addr, void *dest, size_t size) { - const struct spi_nor_config *params = dev->config_info; + const struct spi_nor_config *params = dev->config; int ret; /* should be between 0 and flash size */ @@ -342,7 +342,7 @@ static int spi_nor_read(struct device *dev, off_t addr, void *dest, static int spi_nor_write(struct device *dev, off_t addr, const void *src, size_t size) { - const struct spi_nor_config *params = dev->config_info; + const struct spi_nor_config *params = dev->config; int ret = 0; /* should be between 0 and flash size */ @@ -387,7 +387,7 @@ out: static int spi_nor_erase(struct device *dev, off_t addr, size_t size) { - const struct spi_nor_config *params = dev->config_info; + const struct spi_nor_config *params = dev->config; int ret = 0; /* erase area must be subregion of device */ @@ -486,7 +486,7 @@ static int spi_nor_write_protection_set(struct device *dev, bool write_protect) static int spi_nor_configure(struct device *dev) { struct spi_nor_data *data = dev->driver_data; - const struct spi_nor_config *params = dev->config_info; + const struct spi_nor_config *params = dev->config; data->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!data->spi) { diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c index 616b503166c..b0eb680132f 100644 --- a/drivers/gpio/gpio_cc32xx.c +++ b/drivers/gpio/gpio_cc32xx.c @@ -60,7 +60,7 @@ struct gpio_cc32xx_data { }; #define DEV_CFG(dev) \ - ((const struct gpio_cc32xx_config *)(dev)->config_info) + ((const struct gpio_cc32xx_config *)(dev)->config) #define DEV_DATA(dev) \ ((struct gpio_cc32xx_data *)(dev)->driver_data) diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c index 60aade7fd21..b4d03407211 100644 --- a/drivers/gpio/gpio_cmsdk_ahb.c +++ b/drivers/gpio/gpio_cmsdk_ahb.c @@ -46,7 +46,7 @@ struct gpio_cmsdk_ahb_dev_data { static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; *value = cfg->port->data; @@ -56,7 +56,7 @@ static int gpio_cmsdk_ahb_port_get_raw(struct device *dev, uint32_t *value) static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; cfg->port->dataout = (cfg->port->dataout & ~mask) | (mask & value); @@ -65,7 +65,7 @@ static int gpio_cmsdk_ahb_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; cfg->port->dataout |= mask; @@ -74,7 +74,7 @@ static int gpio_cmsdk_ahb_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; cfg->port->dataout &= ~mask; @@ -83,7 +83,7 @@ static int gpio_cmsdk_ahb_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; cfg->port->dataout ^= mask; @@ -92,7 +92,7 @@ static int gpio_cmsdk_ahb_port_toggle_bits(struct device *dev, uint32_t mask) static int cmsdk_ahb_gpio_config(struct device *dev, uint32_t mask, gpio_flags_t flags) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; if (((flags & GPIO_INPUT) == 0) && ((flags & GPIO_OUTPUT) == 0)) { return -ENOTSUP; @@ -148,7 +148,7 @@ static int gpio_cmsdk_ahb_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; if (trig == GPIO_INT_TRIG_BOTH) { return -ENOTSUP; @@ -187,7 +187,7 @@ static int gpio_cmsdk_ahb_pin_interrupt_configure(struct device *dev, static void gpio_cmsdk_ahb_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; struct gpio_cmsdk_ahb_dev_data *data = dev->driver_data; uint32_t int_stat; @@ -228,7 +228,7 @@ static const struct gpio_driver_api gpio_cmsdk_ahb_drv_api_funcs = { */ static int gpio_cmsdk_ahb_init(struct device *dev) { - const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config_info; + const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; #ifdef CONFIG_CLOCK_CONTROL /* Enable clock for subsystem */ diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index 0f668c2a37e..bada03f1ef1 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -99,7 +99,7 @@ static inline void gpio_dw_clock_config(struct device *port) static inline void gpio_dw_clock_on(struct device *port) { - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; struct gpio_dw_runtime *context = port->driver_data; clock_control_on(context->clock, config->clock_data); @@ -107,7 +107,7 @@ static inline void gpio_dw_clock_on(struct device *port) static inline void gpio_dw_clock_off(struct device *port) { - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; struct gpio_dw_runtime *context = port->driver_data; clock_control_off(context->clock, config->clock_data); @@ -211,7 +211,7 @@ static int gpio_dw_pin_interrupt_configure(struct device *port, enum gpio_int_trig trig) { struct gpio_dw_runtime *context = port->driver_data; - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t dir_port = dw_get_dir_port(port_base_addr); @@ -275,7 +275,7 @@ static inline void dw_pin_config(struct device *port, uint32_t pin, int flags) { struct gpio_dw_runtime *context = port->driver_data; - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t dir_port = dw_get_dir_port(port_base_addr); @@ -307,7 +307,7 @@ static inline int gpio_dw_config(struct device *port, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; uint32_t io_flags; /* Check for invalid pin number */ @@ -520,7 +520,7 @@ static const struct gpio_driver_api api_funcs = { static int gpio_dw_initialize(struct device *port) { struct gpio_dw_runtime *context = port->driver_data; - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; uint32_t base_addr; if (dw_interrupt_support(config)) { @@ -591,7 +591,7 @@ DEVICE_AND_API_INIT(gpio_dw_0, DT_INST_LABEL(0), static void gpio_config_0_irq(struct device *port) { #if (DT_INST_IRQN(0) > 0) - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; #ifdef CONFIG_GPIO_DW_0_IRQ_DIRECT IRQ_CONNECT(DT_INST_IRQN(0), @@ -661,7 +661,7 @@ DEVICE_AND_API_INIT(gpio_dw_1, DT_INST_LABEL(1), static void gpio_config_1_irq(struct device *port) { #if (DT_INST_IRQN(1) > 0) - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; #ifdef CONFIG_GPIO_DW_1_IRQ_DIRECT IRQ_CONNECT(DT_INST_IRQN(1), @@ -729,7 +729,7 @@ DEVICE_AND_API_INIT(gpio_dw_2, DT_INST_LABEL(2), static void gpio_config_2_irq(struct device *port) { #if (DT_INST_IRQN(2) > 0) - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; #ifdef CONFIG_GPIO_DW_2_IRQ_DIRECT IRQ_CONNECT(DT_INST_IRQN(2), @@ -797,7 +797,7 @@ DEVICE_AND_API_INIT(gpio_dw_3, DT_INST_LABEL(3), static void gpio_config_3_irq(struct device *port) { #if (DT_INST_IRQN(3) > 0) - const struct gpio_dw_config *config = port->config_info; + const struct gpio_dw_config *config = port->config; #ifdef CONFIG_GPIO_DW_3_IRQ_DIRECT IRQ_CONNECT(DT_INST_IRQN(3), diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c index dd997b11491..2223d635487 100644 --- a/drivers/gpio/gpio_gecko.c +++ b/drivers/gpio/gpio_gecko.c @@ -75,7 +75,7 @@ static int gpio_gecko_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; GPIO_Mode_TypeDef mode; unsigned int out = 0U; @@ -126,7 +126,7 @@ static int gpio_gecko_configure(struct device *dev, static int gpio_gecko_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; *value = GPIO_PortInGet(gpio_index); @@ -137,7 +137,7 @@ static int gpio_gecko_port_get_raw(struct device *dev, uint32_t *value) static int gpio_gecko_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; GPIO_PortOutSetVal(gpio_index, value, mask); @@ -147,7 +147,7 @@ static int gpio_gecko_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_gecko_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; GPIO_PortOutSet(gpio_index, mask); @@ -157,7 +157,7 @@ static int gpio_gecko_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_gecko_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; GPIO_PortOutClear(gpio_index, mask); @@ -167,7 +167,7 @@ static int gpio_gecko_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_gecko_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; GPIO_Port_TypeDef gpio_index = config->gpio_index; GPIO_PortOutToggle(gpio_index, mask); @@ -179,7 +179,7 @@ static int gpio_gecko_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_gecko_config *config = dev->config_info; + const struct gpio_gecko_config *config = dev->config; struct gpio_gecko_data *data = dev->driver_data; /* Interrupt on static level is not supported by the hardware */ diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c index 06f2cc3cd2a..6e4db488e2a 100644 --- a/drivers/gpio/gpio_ht16k33.c +++ b/drivers/gpio/gpio_ht16k33.c @@ -147,7 +147,7 @@ static uint32_t gpio_ht16k33_get_pending_int(struct device *dev) static int gpio_ht16k33_init(struct device *dev) { - const struct gpio_ht16k33_cfg *config = dev->config_info; + const struct gpio_ht16k33_cfg *config = dev->config; struct gpio_ht16k33_data *data = dev->driver_data; if (config->keyscan_idx >= HT16K33_KEYSCAN_ROWS) { diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c index 9680ee54697..df99f8b6c40 100644 --- a/drivers/gpio/gpio_imx.c +++ b/drivers/gpio/gpio_imx.c @@ -31,7 +31,7 @@ struct imx_gpio_data { static int imx_gpio_configure(struct device *port, gpio_pin_t pin, gpio_flags_t flags) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; if (((flags & GPIO_INPUT) != 0U) && ((flags & GPIO_OUTPUT) != 0U)) { @@ -68,7 +68,7 @@ static int imx_gpio_configure(struct device *port, gpio_pin_t pin, static int imx_gpio_port_get_raw(struct device *port, uint32_t *value) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; *value = GPIO_ReadPortInput(base); @@ -80,7 +80,7 @@ static int imx_gpio_port_set_masked_raw(struct device *port, gpio_port_pins_t mask, gpio_port_value_t value) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; GPIO_WritePortOutput(base, @@ -92,7 +92,7 @@ static int imx_gpio_port_set_masked_raw(struct device *port, static int imx_gpio_port_set_bits_raw(struct device *port, gpio_port_pins_t pins) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; GPIO_WritePortOutput(base, GPIO_ReadPortInput(base) | pins); @@ -103,7 +103,7 @@ static int imx_gpio_port_set_bits_raw(struct device *port, static int imx_gpio_port_clear_bits_raw(struct device *port, gpio_port_pins_t pins) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; GPIO_WritePortOutput(base, GPIO_ReadPortInput(base) & ~pins); @@ -113,7 +113,7 @@ static int imx_gpio_port_clear_bits_raw(struct device *port, static int imx_gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; GPIO_WritePortOutput(base, GPIO_ReadPortInput(base) ^ pins); @@ -126,7 +126,7 @@ static int imx_gpio_pin_interrupt_configure(struct device *port, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; GPIO_Type *base = config->base; volatile uint32_t *icr_reg; unsigned int key; @@ -185,7 +185,7 @@ static int imx_gpio_manage_callback(struct device *port, static void imx_gpio_port_isr(void *arg) { struct device *port = (struct device *)arg; - const struct imx_gpio_config *config = port->config_info; + const struct imx_gpio_config *config = port->config; struct imx_gpio_data *data = port->driver_data; uint32_t int_status; diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c index 07a3072f0b0..ac5d454c9c1 100644 --- a/drivers/gpio/gpio_intel_apl.c +++ b/drivers/gpio/gpio_intel_apl.c @@ -105,7 +105,7 @@ BUILD_ASSERT(DT_INST_IRQN(0) == 14); /* Required by DEVICE_MMIO_NAMED_* macros */ #define DEV_CFG(_dev) \ - ((const struct gpio_intel_apl_config *)(_dev)->config_info) + ((const struct gpio_intel_apl_config *)(_dev)->config) #define DEV_DATA(_dev) ((struct gpio_intel_apl_data *)(_dev)->driver_data) struct gpio_intel_apl_config { @@ -195,7 +195,7 @@ static void gpio_intel_apl_isr(void *arg) for (isr_dev = 0; isr_dev < nr_isr_devs; ++isr_dev) { dev = isr_devs[isr_dev]; - cfg = dev->config_info; + cfg = dev->config; data = dev->driver_data; reg = regs(dev) + REG_GPI_INT_STS_BASE @@ -220,7 +220,7 @@ static void gpio_intel_apl_isr(void *arg) static int gpio_intel_apl_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_intel_apl_config *cfg = dev->config_info; + const struct gpio_intel_apl_config *cfg = dev->config; struct gpio_intel_apl_data *data = dev->driver_data; uint32_t raw_pin, reg, cfg0, cfg1; @@ -295,7 +295,7 @@ static int gpio_intel_apl_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_intel_apl_config *cfg = dev->config_info; + const struct gpio_intel_apl_config *cfg = dev->config; struct gpio_intel_apl_data *data = dev->driver_data; uint32_t raw_pin, cfg0, cfg1; uint32_t reg, reg_en, reg_sts; @@ -394,7 +394,7 @@ static int gpio_intel_apl_manage_callback(struct device *dev, static int port_get_raw(struct device *dev, uint32_t mask, uint32_t *value, bool read_tx) { - const struct gpio_intel_apl_config *cfg = dev->config_info; + const struct gpio_intel_apl_config *cfg = dev->config; struct gpio_intel_apl_data *data = dev->driver_data; uint32_t pin, raw_pin, reg_addr, reg_val, cmp; @@ -433,7 +433,7 @@ static int port_get_raw(struct device *dev, uint32_t mask, uint32_t *value, static int port_set_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_intel_apl_config *cfg = dev->config_info; + const struct gpio_intel_apl_config *cfg = dev->config; struct gpio_intel_apl_data *data = dev->driver_data; uint32_t pin, raw_pin, reg_addr, reg_val; diff --git a/drivers/gpio/gpio_litex.c b/drivers/gpio/gpio_litex.c index 5a28f2554cc..30eefaac10a 100644 --- a/drivers/gpio/gpio_litex.c +++ b/drivers/gpio/gpio_litex.c @@ -43,7 +43,7 @@ struct gpio_litex_data { /* Helper macros for GPIO */ #define DEV_GPIO_CFG(dev) \ - ((const struct gpio_litex_cfg *)(dev)->config_info) + ((const struct gpio_litex_cfg *)(dev)->config) /* Helper functions for bit / port access */ diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c index 4c165109abe..bb0d9405388 100644 --- a/drivers/gpio/gpio_lmp90xxx.c +++ b/drivers/gpio/gpio_lmp90xxx.c @@ -138,7 +138,7 @@ static int gpio_lmp90xxx_pin_interrupt_configure(struct device *dev, static int gpio_lmp90xxx_init(struct device *dev) { - const struct gpio_lmp90xxx_config *config = dev->config_info; + const struct gpio_lmp90xxx_config *config = dev->config; struct gpio_lmp90xxx_data *data = dev->driver_data; data->parent = device_get_binding(config->parent_dev_name); diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c index 33485812319..9e5ab20fb61 100644 --- a/drivers/gpio/gpio_lpc11u6x.c +++ b/drivers/gpio/gpio_lpc11u6x.c @@ -24,7 +24,7 @@ #include "gpio_utils.h" #define DEV_CFG(dev) ((const struct gpio_lpc11u6x_config *) \ - ((dev)->config_info)) + ((dev)->config)) #define DEV_DATA(dev) ((struct gpio_lpc11u6x_data *) \ ((dev)->driver_data)) diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c index c3eb613cd76..85613f18b34 100644 --- a/drivers/gpio/gpio_mchp_xec.c +++ b/drivers/gpio/gpio_mchp_xec.c @@ -47,7 +47,7 @@ struct gpio_xec_config { static int gpio_xec_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; __IO uint32_t *current_pcr1; uint32_t pcr1 = 0U; uint32_t mask = 0U; @@ -130,7 +130,7 @@ static int gpio_xec_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; __IO uint32_t *current_pcr1; uint32_t pcr1 = 0U; uint32_t mask = 0U; @@ -206,7 +206,7 @@ static int gpio_xec_pin_interrupt_configure(struct device *dev, static int gpio_xec_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* GPIO output registers are used for writing */ __IO uint32_t *gpio_base = GPIO_OUT_BASE(config); @@ -218,7 +218,7 @@ static int gpio_xec_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_xec_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* GPIO output registers are used for writing */ __IO uint32_t *gpio_base = GPIO_OUT_BASE(config); @@ -230,7 +230,7 @@ static int gpio_xec_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_xec_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* GPIO output registers are used for writing */ __IO uint32_t *gpio_base = GPIO_OUT_BASE(config); @@ -242,7 +242,7 @@ static int gpio_xec_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_xec_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* GPIO output registers are used for writing */ __IO uint32_t *gpio_base = GPIO_OUT_BASE(config); @@ -254,7 +254,7 @@ static int gpio_xec_port_toggle_bits(struct device *dev, uint32_t mask) static int gpio_xec_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* GPIO input registers are used for reading */ __IO uint32_t *gpio_base = GPIO_IN_BASE(config); @@ -277,7 +277,7 @@ static int gpio_xec_manage_callback(struct device *dev, static void gpio_gpio_xec_port_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; struct gpio_xec_data *data = dev->driver_data; uint32_t girq_result; @@ -333,7 +333,7 @@ DEVICE_AND_API_INIT(gpio_xec_port000_036, static int gpio_xec_port000_036_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_000_036), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); @@ -378,7 +378,7 @@ DEVICE_AND_API_INIT(gpio_xec_port040_076, static int gpio_xec_port040_076_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_040_076), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); @@ -423,7 +423,7 @@ DEVICE_AND_API_INIT(gpio_xec_port100_136, static int gpio_xec_port100_136_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_100_136), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); @@ -468,7 +468,7 @@ DEVICE_AND_API_INIT(gpio_xec_port140_176, static int gpio_xec_port140_176_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_140_176), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); @@ -513,7 +513,7 @@ DEVICE_AND_API_INIT(gpio_xec_port200_236, static int gpio_xec_port200_236_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_200_236), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); @@ -558,7 +558,7 @@ DEVICE_AND_API_INIT(gpio_xec_port240_276, static int gpio_xec_port240_276_init(struct device *dev) { #if DT_IRQ_HAS_CELL(DT_NODELABEL(gpio_240_276), irq) - const struct gpio_xec_config *config = dev->config_info; + const struct gpio_xec_config *config = dev->config; /* Turn on the block enable in the EC aggregator */ MCHP_GIRQ_BLK_SETEN(config->girq_id); diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c index 3f381bb14bd..db3c8fdc52b 100644 --- a/drivers/gpio/gpio_mcp23s17.c +++ b/drivers/gpio/gpio_mcp23s17.c @@ -360,7 +360,7 @@ static const struct gpio_driver_api api_table = { static int mcp23s17_init(struct device *dev) { const struct mcp23s17_config *const config = - dev->config_info; + dev->config; struct mcp23s17_drv_data *const drv_data = (struct mcp23s17_drv_data *const)dev->driver_data; diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c index c9b1ef6b9df..257d45df470 100644 --- a/drivers/gpio/gpio_mcux.c +++ b/drivers/gpio/gpio_mcux.c @@ -34,7 +34,7 @@ struct gpio_mcux_data { static int gpio_mcux_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; PORT_Type *port_base = config->port_base; uint32_t mask = 0U; @@ -100,7 +100,7 @@ static int gpio_mcux_configure(struct device *dev, static int gpio_mcux_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; *value = gpio_base->PDIR; @@ -111,7 +111,7 @@ static int gpio_mcux_port_get_raw(struct device *dev, uint32_t *value) static int gpio_mcux_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PDOR = (gpio_base->PDOR & ~mask) | (mask & value); @@ -121,7 +121,7 @@ static int gpio_mcux_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_mcux_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PSOR = mask; @@ -131,7 +131,7 @@ static int gpio_mcux_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_mcux_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PCOR = mask; @@ -141,7 +141,7 @@ static int gpio_mcux_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_mcux_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PTOR = mask; @@ -186,7 +186,7 @@ static int gpio_mcux_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; PORT_Type *port_base = config->port_base; @@ -225,7 +225,7 @@ static int gpio_mcux_manage_callback(struct device *dev, static void gpio_mcux_port_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct gpio_mcux_config *config = dev->config_info; + const struct gpio_mcux_config *config = dev->config; struct gpio_mcux_data *data = dev->driver_data; uint32_t int_status; diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c index b71d2781333..bc4da6a915d 100644 --- a/drivers/gpio/gpio_mcux_igpio.c +++ b/drivers/gpio/gpio_mcux_igpio.c @@ -31,7 +31,7 @@ struct mcux_igpio_data { static int mcux_igpio_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; if (((flags & GPIO_INPUT) != 0) && ((flags & GPIO_OUTPUT) != 0)) { @@ -61,7 +61,7 @@ static int mcux_igpio_configure(struct device *dev, static int mcux_igpio_port_get_raw(struct device *dev, uint32_t *value) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; *value = base->DR; @@ -72,7 +72,7 @@ static int mcux_igpio_port_get_raw(struct device *dev, uint32_t *value) static int mcux_igpio_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; base->DR = (base->DR & ~mask) | (mask & value); @@ -82,7 +82,7 @@ static int mcux_igpio_port_set_masked_raw(struct device *dev, uint32_t mask, static int mcux_igpio_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; base->DR_SET = mask; @@ -92,7 +92,7 @@ static int mcux_igpio_port_set_bits_raw(struct device *dev, uint32_t mask) static int mcux_igpio_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; base->DR_CLEAR = mask; @@ -102,7 +102,7 @@ static int mcux_igpio_port_clear_bits_raw(struct device *dev, uint32_t mask) static int mcux_igpio_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; base->DR_TOGGLE = mask; @@ -114,7 +114,7 @@ static int mcux_igpio_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; GPIO_Type *base = config->base; unsigned int key; uint8_t icr; @@ -174,7 +174,7 @@ static int mcux_igpio_manage_callback(struct device *dev, static void mcux_igpio_port_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_igpio_config *config = dev->config_info; + const struct mcux_igpio_config *config = dev->config; struct mcux_igpio_data *data = dev->driver_data; GPIO_Type *base = config->base; uint32_t int_flags; diff --git a/drivers/gpio/gpio_mcux_lpc.c b/drivers/gpio/gpio_mcux_lpc.c index f8c77bc74a8..5e053687470 100644 --- a/drivers/gpio/gpio_mcux_lpc.c +++ b/drivers/gpio/gpio_mcux_lpc.c @@ -63,7 +63,7 @@ struct gpio_mcux_lpc_data { static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; uint32_t port = config->port_no; @@ -116,7 +116,7 @@ static int gpio_mcux_lpc_configure(struct device *dev, gpio_pin_t pin, static int gpio_mcux_lpc_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; *value = gpio_base->PIN[config->port_no]; @@ -127,7 +127,7 @@ static int gpio_mcux_lpc_port_get_raw(struct device *dev, uint32_t *value) static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; uint32_t port = config->port_no; @@ -142,7 +142,7 @@ static int gpio_mcux_lpc_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->SET[config->port_no] = mask; @@ -152,7 +152,7 @@ static int gpio_mcux_lpc_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->CLR[config->port_no] = mask; @@ -162,7 +162,7 @@ static int gpio_mcux_lpc_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->NOT[config->port_no] = mask; @@ -173,7 +173,7 @@ static int gpio_mcux_lpc_port_toggle_bits(struct device *dev, uint32_t mask) static void gpio_mcux_lpc_port_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; struct gpio_mcux_lpc_data *data = dev->driver_data; uint32_t enabled_int; uint32_t int_flags; @@ -245,7 +245,7 @@ static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; struct gpio_mcux_lpc_data *data = dev->driver_data; pint_pin_enable_t interruptMode = kPINT_PinIntEnableNone; GPIO_Type *gpio_base = config->gpio_base; @@ -318,7 +318,7 @@ static int gpio_mcux_lpc_manage_cb(struct device *port, static int gpio_mcux_lpc_init(struct device *dev) { - const struct gpio_mcux_lpc_config *config = dev->config_info; + const struct gpio_mcux_lpc_config *config = dev->config; struct gpio_mcux_lpc_data *data = dev->driver_data; int i; diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c index fa40e6649b4..3ab530a479a 100644 --- a/drivers/gpio/gpio_mmio32.c +++ b/drivers/gpio/gpio_mmio32.c @@ -166,7 +166,7 @@ static const struct gpio_driver_api gpio_mmio32_api = { int gpio_mmio32_init(struct device *dev) { struct gpio_mmio32_context *context = dev->driver_data; - const struct gpio_mmio32_config *config = dev->config_info; + const struct gpio_mmio32_config *config = dev->config; context->config = config; dev->driver_api = &gpio_mmio32_api; diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c index ae5962c435b..0bcf915d495 100644 --- a/drivers/gpio/gpio_nrfx.c +++ b/drivers/gpio/gpio_nrfx.c @@ -42,7 +42,7 @@ static inline struct gpio_nrfx_data *get_port_data(struct device *port) static inline const struct gpio_nrfx_cfg *get_port_cfg(struct device *port) { - return port->config_info; + return port->config; } static int gpiote_channel_alloc(atomic_t *mask, uint32_t abs_pin, diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c index c517d577c44..c051cc687d1 100644 --- a/drivers/gpio/gpio_pca95xx.c +++ b/drivers/gpio/gpio_pca95xx.c @@ -99,8 +99,7 @@ struct gpio_pca95xx_drv_data { */ static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf) { - const struct gpio_pca95xx_config * const config = - dev->config_info; + const struct gpio_pca95xx_config * const config = dev->config; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; struct device * const i2c_master = drv_data->i2c_master; @@ -139,8 +138,7 @@ static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf) static int write_port_regs(struct device *dev, uint8_t reg, uint16_t *cache, uint16_t value) { - const struct gpio_pca95xx_config * const config = - dev->config_info; + const struct gpio_pca95xx_config * const config = dev->config; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; struct device * const i2c_master = drv_data->i2c_master; @@ -252,8 +250,7 @@ static int setup_pin_dir(struct device *dev, uint32_t pin, int flags) */ static int setup_pin_pullupdown(struct device *dev, uint32_t pin, int flags) { - const struct gpio_pca95xx_config * const config = - dev->config_info; + const struct gpio_pca95xx_config * const config = dev->config; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; uint16_t reg_pud; @@ -316,8 +313,7 @@ static int gpio_pca95xx_config(struct device *dev, (struct gpio_pca95xx_drv_data * const)dev->driver_data; #if (CONFIG_GPIO_LOG_LEVEL >= LOG_LEVEL_DEBUG) - const struct gpio_pca95xx_config * const config = - dev->config_info; + const struct gpio_pca95xx_config * const config = dev->config; uint16_t i2c_addr = config->i2c_slave_addr; #endif @@ -470,8 +466,7 @@ static const struct gpio_driver_api gpio_pca95xx_drv_api_funcs = { */ static int gpio_pca95xx_init(struct device *dev) { - const struct gpio_pca95xx_config * const config = - dev->config_info; + const struct gpio_pca95xx_config * const config = dev->config; struct gpio_pca95xx_drv_data * const drv_data = (struct gpio_pca95xx_drv_data * const)dev->driver_data; struct device *i2c_master; diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c index fc9a06d496f..5d5d7559edd 100644 --- a/drivers/gpio/gpio_rv32m1.c +++ b/drivers/gpio/gpio_rv32m1.c @@ -72,7 +72,7 @@ static uint32_t get_port_pcr_irqc_value_from_flags(struct device *dev, static int gpio_rv32m1_configure(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; PORT_Type *port_base = config->port_base; uint32_t mask = 0U; @@ -154,7 +154,7 @@ static int gpio_rv32m1_configure(struct device *dev, static int gpio_rv32m1_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; *value = gpio_base->PDIR; @@ -165,7 +165,7 @@ static int gpio_rv32m1_port_get_raw(struct device *dev, uint32_t *value) static int gpio_rv32m1_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PDOR = (gpio_base->PDOR & ~mask) | (mask & value); @@ -175,7 +175,7 @@ static int gpio_rv32m1_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_rv32m1_port_set_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PSOR = mask; @@ -185,7 +185,7 @@ static int gpio_rv32m1_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, uint32_t mask) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PCOR = mask; @@ -195,7 +195,7 @@ static int gpio_rv32m1_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_rv32m1_port_toggle_bits(struct device *dev, uint32_t mask) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; GPIO_Type *gpio_base = config->gpio_base; gpio_base->PTOR = mask; @@ -207,7 +207,7 @@ static int gpio_rv32m1_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; PORT_Type *port_base = config->port_base; /* Check for an invalid pin number */ @@ -242,7 +242,7 @@ static int gpio_rv32m1_manage_callback(struct device *dev, static void gpio_rv32m1_port_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; struct gpio_rv32m1_data *data = dev->driver_data; uint32_t int_status; @@ -256,7 +256,7 @@ static void gpio_rv32m1_port_isr(void *arg) static int gpio_rv32m1_init(struct device *dev) { - const struct gpio_rv32m1_config *config = dev->config_info; + const struct gpio_rv32m1_config *config = dev->config; struct device *clk; int ret; diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c index 49d531532d0..3d4683b1048 100644 --- a/drivers/gpio/gpio_sam.c +++ b/drivers/gpio/gpio_sam.c @@ -32,7 +32,7 @@ struct gpio_sam_runtime { }; #define DEV_CFG(dev) \ - ((const struct gpio_sam_config * const)(dev)->config_info) + ((const struct gpio_sam_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct gpio_sam_runtime * const)(dev)->driver_data) diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c index 211c697f1ab..86472eb1507 100644 --- a/drivers/gpio/gpio_sam0.c +++ b/drivers/gpio/gpio_sam0.c @@ -38,7 +38,7 @@ struct gpio_sam0_data { }; #define DEV_CFG(dev) \ - ((const struct gpio_sam0_config *const)(dev)->config_info) + ((const struct gpio_sam0_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct gpio_sam0_data *const)(dev)->driver_data) diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c index 9f4f37f69f0..6aceb02628f 100644 --- a/drivers/gpio/gpio_sifive.c +++ b/drivers/gpio/gpio_sifive.c @@ -60,7 +60,7 @@ struct gpio_sifive_data { /* Helper Macros for GPIO */ #define DEV_GPIO_CFG(dev) \ - ((const struct gpio_sifive_config * const)(dev)->config_info) + ((const struct gpio_sifive_config * const)(dev)->config) #define DEV_GPIO(dev) \ ((volatile struct gpio_sifive_t *)(DEV_GPIO_CFG(dev))->gpio_base_addr) #define DEV_GPIO_DATA(dev) \ diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c index 4563dded032..4773afc258f 100644 --- a/drivers/gpio/gpio_stellaris.c +++ b/drivers/gpio/gpio_stellaris.c @@ -31,7 +31,7 @@ struct gpio_stellaris_runtime { #define DEV_CFG(dev) \ ((const struct gpio_stellaris_config *const) \ - (dev)->config_info) + (dev)->config) #define DEV_DATA(dev) \ ((struct gpio_stellaris_runtime *const) \ diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c index 61242da35ea..8dcab1635eb 100644 --- a/drivers/gpio/gpio_stm32.c +++ b/drivers/gpio/gpio_stm32.c @@ -315,7 +315,7 @@ static int gpio_stm32_enable_int(int port, int pin) static int gpio_stm32_port_get_raw(struct device *dev, uint32_t *value) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; *value = LL_GPIO_ReadInputPort(gpio); @@ -327,7 +327,7 @@ static int gpio_stm32_port_set_masked_raw(struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; uint32_t port_value; @@ -344,7 +344,7 @@ static int gpio_stm32_port_set_masked_raw(struct device *dev, static int gpio_stm32_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; /* @@ -359,7 +359,7 @@ static int gpio_stm32_port_set_bits_raw(struct device *dev, static int gpio_stm32_port_clear_bits_raw(struct device *dev, gpio_port_pins_t pins) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; #ifdef CONFIG_SOC_SERIES_STM32F1X @@ -379,7 +379,7 @@ static int gpio_stm32_port_clear_bits_raw(struct device *dev, static int gpio_stm32_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; GPIO_TypeDef *gpio = (GPIO_TypeDef *)cfg->base; /* @@ -399,7 +399,7 @@ static int gpio_stm32_port_toggle_bits(struct device *dev, static int gpio_stm32_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; int err = 0; int pincfg; @@ -429,7 +429,7 @@ static int gpio_stm32_pin_interrupt_configure(struct device *dev, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - const struct gpio_stm32_config *cfg = dev->config_info; + const struct gpio_stm32_config *cfg = dev->config; int edge = 0; int err = 0; @@ -508,7 +508,7 @@ static const struct gpio_driver_api gpio_stm32_driver = { */ static int gpio_stm32_init(struct device *device) { - const struct gpio_stm32_config *cfg = device->config_info; + const struct gpio_stm32_config *cfg = device->config; /* enable clock for subsystem */ struct device *clk = diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c index da8666e33f8..ca7cc30eeb6 100644 --- a/drivers/gpio/gpio_sx1509b.c +++ b/drivers/gpio/gpio_sx1509b.c @@ -177,7 +177,7 @@ static inline int i2c_reg_write_byte_be(struct device *dev, uint16_t dev_addr, static int sx1509b_handle_interrupt(void *arg) { struct device *dev = (struct device *) arg; - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; int ret = 0; uint16_t int_source; @@ -232,7 +232,7 @@ static int sx1509b_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; struct sx1509b_pin_state *pins = &drv_data->pin_state; struct { @@ -370,7 +370,7 @@ out: static int port_get(struct device *dev, gpio_port_value_t *value) { - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; uint16_t pin_data; int rc = 0; @@ -409,7 +409,7 @@ static int port_write(struct device *dev, return -EWOULDBLOCK; } - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; uint16_t *outp = &drv_data->pin_state.data; @@ -473,7 +473,7 @@ static int pin_interrupt_configure(struct device *dev, return -ENOTSUP; } - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; struct sx1509b_irq_state *irq = &drv_data->irq_state; struct { @@ -532,7 +532,7 @@ static int pin_interrupt_configure(struct device *dev, */ static int sx1509b_init(struct device *dev) { - const struct sx1509b_config *cfg = dev->config_info; + const struct sx1509b_config *cfg = dev->config; struct sx1509b_drv_data *drv_data = dev->driver_data; int rc; diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index 21fe50c0801..4513ebdd588 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -52,7 +52,7 @@ static inline struct i2c_cc13xx_cc26xx_data *get_dev_data(struct device *dev) static inline const struct i2c_cc13xx_cc26xx_config * get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static int i2c_cc13xx_cc26xx_transmit(struct device *dev, const uint8_t *buf, diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c index a5d07a2c31a..e0ed492ba19 100644 --- a/drivers/i2c/i2c_cc32xx.c +++ b/drivers/i2c/i2c_cc32xx.c @@ -39,7 +39,7 @@ LOG_MODULE_REGISTER(i2c_cc32xx); #define IS_I2C_MSG_WRITE(flags) ((flags & I2C_MSG_RW_MASK) == I2C_MSG_WRITE) #define DEV_CFG(dev) \ - ((const struct i2c_cc32xx_config *const)(dev)->config_info) + ((const struct i2c_cc32xx_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_cc32xx_data *const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index f68a9a0b1d7..63e7bfb0a7a 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -605,7 +605,7 @@ static const struct i2c_driver_api funcs = { static int i2c_dw_initialize(struct device *dev) { - const struct i2c_dw_rom_config * const rom = dev->config_info; + const struct i2c_dw_rom_config * const rom = dev->config; struct i2c_dw_dev_config * const dw = dev->driver_data; volatile struct i2c_dw_registers *regs; diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c index ca9af8574ef..32f63b41e45 100644 --- a/drivers/i2c/i2c_esp32.c +++ b/drivers/i2c/i2c_esp32.c @@ -140,7 +140,7 @@ static int i2c_esp32_configure_speed(struct device *dev, [I2C_SPEED_ULTRA] = 0 }; - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; struct i2c_esp32_data *data = dev->driver_data; uint32_t sys_clk_freq = 0; @@ -185,7 +185,7 @@ static int i2c_esp32_configure_speed(struct device *dev, static int i2c_esp32_configure(struct device *dev, uint32_t dev_config) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; struct i2c_esp32_data *data = dev->driver_data; unsigned int key = irq_lock(); uint32_t v = 0U; @@ -293,7 +293,7 @@ static int i2c_esp32_spin_yield(int *counter) static int i2c_esp32_transmit(struct device *dev) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; struct i2c_esp32_data *data = dev->driver_data; uint32_t status; @@ -317,7 +317,7 @@ static int i2c_esp32_transmit(struct device *dev) static int i2c_esp32_wait(struct device *dev, volatile struct i2c_esp32_cmd *wait_cmd) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; int counter = 0; int ret; @@ -360,7 +360,7 @@ i2c_esp32_write_addr(struct device *dev, struct i2c_msg *msg, uint16_t addr) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; struct i2c_esp32_data *data = dev->driver_data; uint32_t addr_len = 1U; @@ -389,7 +389,7 @@ i2c_esp32_write_addr(struct device *dev, static int i2c_esp32_read_msg(struct device *dev, uint16_t addr, struct i2c_msg msg) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; volatile struct i2c_esp32_cmd *cmd = (void *)I2C_COMD0_REG(config->index); uint32_t i; @@ -471,7 +471,7 @@ static int i2c_esp32_read_msg(struct device *dev, uint16_t addr, static int i2c_esp32_write_msg(struct device *dev, uint16_t addr, struct i2c_msg msg) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; volatile struct i2c_esp32_cmd *cmd = (void *)I2C_COMD0_REG(config->index); @@ -556,7 +556,7 @@ static void i2c_esp32_isr(void *arg) I2C_TRANS_COMPLETE_INT_ST | I2C_ARBITRATION_LOST_INT_ST; struct device *device = arg; - const struct i2c_esp32_config *config = device->config_info; + const struct i2c_esp32_config *config = device->config; if (sys_read32(I2C_INT_STATUS_REG(config->index)) & fifo_give_mask) { struct i2c_esp32_data *data = device->driver_data; @@ -673,7 +673,7 @@ DEVICE_AND_API_INIT(i2c_esp32_1, DT_INST_LABEL(1), &i2c_esp32_init, static int i2c_esp32_init(struct device *dev) { - const struct i2c_esp32_config *config = dev->config_info; + const struct i2c_esp32_config *config = dev->config; struct i2c_esp32_data *data = dev->driver_data; uint32_t bitrate_cfg = i2c_map_dt_bitrate(config->bitrate); data->clock_dev = device_get_binding(config->clock_name); diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c index 234ba13a8bf..b50c8df418e 100644 --- a/drivers/i2c/i2c_gecko.c +++ b/drivers/i2c/i2c_gecko.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(i2c_gecko); #include "i2c-priv.h" #define DEV_CFG(dev) \ - ((const struct i2c_gecko_config * const)(dev)->config_info) + ((const struct i2c_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_gecko_data * const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c index 350ff1fcd80..381b58d61d7 100644 --- a/drivers/i2c/i2c_gpio.c +++ b/drivers/i2c/i2c_gpio.c @@ -118,7 +118,7 @@ static struct i2c_driver_api api = { static int i2c_gpio_init(struct device *dev) { struct i2c_gpio_context *context = dev->driver_data; - const struct i2c_gpio_config *config = dev->config_info; + const struct i2c_gpio_config *config = dev->config; uint32_t bitrate_cfg; int err; diff --git a/drivers/i2c/i2c_imx.c b/drivers/i2c/i2c_imx.c index 08ce0ca3d37..594183763d0 100644 --- a/drivers/i2c/i2c_imx.c +++ b/drivers/i2c/i2c_imx.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(i2c_imx); #include "i2c-priv.h" #define DEV_CFG(dev) \ - ((const struct i2c_imx_config * const)(dev)->config_info) + ((const struct i2c_imx_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_imx_data * const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c index 16eb7d5fac8..2a7554a4627 100644 --- a/drivers/i2c/i2c_litex.c +++ b/drivers/i2c/i2c_litex.c @@ -26,7 +26,7 @@ struct i2c_litex_cfg { }; #define GET_I2C_CFG(dev) \ - ((const struct i2c_litex_cfg *) dev->config_info) + ((const struct i2c_litex_cfg *) dev->config) #define GET_I2C_BITBANG(dev) \ ((struct i2c_bitbang *) dev->driver_data) diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h index 7d8d7e37609..d64e8cad705 100644 --- a/drivers/i2c/i2c_ll_stm32.h +++ b/drivers/i2c/i2c_ll_stm32.h @@ -71,6 +71,6 @@ int i2c_stm32_slave_unregister(struct device *dev, #define DEV_DATA(dev) ((struct i2c_stm32_data * const)(dev)->driver_data) #define DEV_CFG(dev) \ -((const struct i2c_stm32_config * const)(dev)->config_info) +((const struct i2c_stm32_config * const)(dev)->config) #endif /* ZEPHYR_DRIVERS_I2C_I2C_LL_STM32_H_ */ diff --git a/drivers/i2c/i2c_lpc11u6x.c b/drivers/i2c/i2c_lpc11u6x.c index 42466a29244..4897a0a3715 100644 --- a/drivers/i2c/i2c_lpc11u6x.c +++ b/drivers/i2c/i2c_lpc11u6x.c @@ -13,7 +13,7 @@ #include #include "i2c_lpc11u6x.h" -#define DEV_CFG(dev) ((dev)->config_info) +#define DEV_CFG(dev) ((dev)->config) #define DEV_BASE(dev) (((struct lpc11u6x_i2c_config *) DEV_CFG((dev)))->base) #define DEV_DATA(dev) ((dev)->driver_data) diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c index 9ba77e51ab3..2d024674269 100644 --- a/drivers/i2c/i2c_mchp_xec.c +++ b/drivers/i2c/i2c_mchp_xec.c @@ -149,7 +149,7 @@ static bool check_lines(uint32_t ba) static int i2c_xec_configure(struct device *dev, uint32_t dev_config_raw) { const struct i2c_xec_config *config = - (const struct i2c_xec_config *const) (dev->config_info); + (const struct i2c_xec_config *const) (dev->config); uint32_t ba = config->base_addr; uint8_t port_sel = config->port_sel; uint32_t speed_id; @@ -229,7 +229,7 @@ static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg, uint16_t addr) { const struct i2c_xec_config *config = - (const struct i2c_xec_config *const) (dev->config_info); + (const struct i2c_xec_config *const) (dev->config); struct i2c_xec_data *data = (struct i2c_xec_data *const) (dev->driver_data); uint32_t ba = config->base_addr; @@ -292,7 +292,7 @@ static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg, uint16_t addr) { const struct i2c_xec_config *config = - (const struct i2c_xec_config *const) (dev->config_info); + (const struct i2c_xec_config *const) (dev->config); struct i2c_xec_data *data = (struct i2c_xec_data *const) (dev->driver_data); uint32_t ba = config->base_addr; diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c index 8b35da4c27a..870bd4e65e3 100644 --- a/drivers/i2c/i2c_mcux.c +++ b/drivers/i2c/i2c_mcux.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(i2c_mcux); #include "i2c-priv.h" #define DEV_CFG(dev) \ - ((const struct i2c_mcux_config * const)(dev)->config_info) + ((const struct i2c_mcux_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_mcux_data * const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c index 093b49e1431..4c9194eaed7 100644 --- a/drivers/i2c/i2c_mcux_flexcomm.c +++ b/drivers/i2c/i2c_mcux_flexcomm.c @@ -31,7 +31,7 @@ struct mcux_flexcomm_data { static int mcux_flexcomm_configure(struct device *dev, uint32_t dev_config_raw) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; I2C_Type *base = config->base; uint32_t clock_freq; uint32_t baudrate; @@ -96,7 +96,7 @@ static uint32_t mcux_flexcomm_convert_flags(int msg_flags) static int mcux_flexcomm_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t addr) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; struct mcux_flexcomm_data *data = dev->driver_data; I2C_Type *base = config->base; i2c_master_transfer_t transfer; @@ -159,7 +159,7 @@ static int mcux_flexcomm_transfer(struct device *dev, struct i2c_msg *msgs, static void mcux_flexcomm_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; struct mcux_flexcomm_data *data = dev->driver_data; I2C_Type *base = config->base; @@ -168,7 +168,7 @@ static void mcux_flexcomm_isr(void *arg) static int mcux_flexcomm_init(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; struct mcux_flexcomm_data *data = dev->driver_data; I2C_Type *base = config->base; uint32_t clock_freq, bitrate_cfg; diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c index f66fbbaa985..2acee5111dc 100644 --- a/drivers/i2c/i2c_mcux_lpi2c.c +++ b/drivers/i2c/i2c_mcux_lpi2c.c @@ -34,7 +34,7 @@ struct mcux_lpi2c_data { static int mcux_lpi2c_configure(struct device *dev, uint32_t dev_config_raw) { - const struct mcux_lpi2c_config *config = dev->config_info; + const struct mcux_lpi2c_config *config = dev->config; LPI2C_Type *base = config->base; struct device *clock_dev; uint32_t clock_freq; @@ -108,7 +108,7 @@ static uint32_t mcux_lpi2c_convert_flags(int msg_flags) static int mcux_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t addr) { - const struct mcux_lpi2c_config *config = dev->config_info; + const struct mcux_lpi2c_config *config = dev->config; struct mcux_lpi2c_data *data = dev->driver_data; LPI2C_Type *base = config->base; lpi2c_master_transfer_t transfer; @@ -171,7 +171,7 @@ static int mcux_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, static void mcux_lpi2c_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_lpi2c_config *config = dev->config_info; + const struct mcux_lpi2c_config *config = dev->config; struct mcux_lpi2c_data *data = dev->driver_data; LPI2C_Type *base = config->base; @@ -180,7 +180,7 @@ static void mcux_lpi2c_isr(void *arg) static int mcux_lpi2c_init(struct device *dev) { - const struct mcux_lpi2c_config *config = dev->config_info; + const struct mcux_lpi2c_config *config = dev->config; struct mcux_lpi2c_data *data = dev->driver_data; LPI2C_Type *base = config->base; struct device *clock_dev; diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c index 49cb6c11d60..6ea2fe7f9b1 100644 --- a/drivers/i2c/i2c_nios2.c +++ b/drivers/i2c/i2c_nios2.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(i2c_nios2); #define NIOS2_I2C_TIMEOUT_USEC 1000 #define DEV_CFG(dev) \ - ((struct i2c_nios2_config *)(dev)->config_info) + ((struct i2c_nios2_config *)(dev)->config) struct i2c_nios2_config { ALT_AVALON_I2C_DEV_t i2c_dev; diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 1f3c9d1d69a..7bdd84689b5 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -37,7 +37,7 @@ static inline struct i2c_nrfx_twi_data *get_dev_data(struct device *dev) static inline const struct i2c_nrfx_twi_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs, diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 31e89f64ce0..36014a05927 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -40,7 +40,7 @@ static inline struct i2c_nrfx_twim_data *get_dev_data(struct device *dev) static inline const struct i2c_nrfx_twim_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs, diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c index 12efe557b7e..20bae7a7384 100644 --- a/drivers/i2c/i2c_rv32m1_lpi2c.c +++ b/drivers/i2c/i2c_rv32m1_lpi2c.c @@ -37,7 +37,7 @@ struct rv32m1_lpi2c_data { static int rv32m1_lpi2c_configure(struct device *dev, uint32_t dev_config) { - const struct rv32m1_lpi2c_config *config = dev->config_info; + const struct rv32m1_lpi2c_config *config = dev->config; struct device *clk; uint32_t baudrate; uint32_t clk_freq; @@ -129,7 +129,7 @@ static uint32_t rv32m1_lpi2c_convert_flags(int msg_flags) static int rv32m1_lpi2c_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t addr) { - const struct rv32m1_lpi2c_config *config = dev->config_info; + const struct rv32m1_lpi2c_config *config = dev->config; struct rv32m1_lpi2c_data *data = dev->driver_data; lpi2c_master_transfer_t transfer; status_t status; @@ -202,7 +202,7 @@ out: static void rv32m1_lpi2c_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct rv32m1_lpi2c_config *config = dev->config_info; + const struct rv32m1_lpi2c_config *config = dev->config; struct rv32m1_lpi2c_data *data = dev->driver_data; LPI2C_MasterTransferHandleIRQ(config->base, &data->handle); @@ -210,7 +210,7 @@ static void rv32m1_lpi2c_isr(void *arg) static int rv32m1_lpi2c_init(struct device *dev) { - const struct rv32m1_lpi2c_config *config = dev->config_info; + const struct rv32m1_lpi2c_config *config = dev->config; struct rv32m1_lpi2c_data *data = dev->driver_data; lpi2c_master_config_t master_config; struct device *clk; diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c index 2210111dfd3..5fe5b17a8a2 100644 --- a/drivers/i2c/i2c_sam0.c +++ b/drivers/i2c/i2c_sam0.c @@ -60,7 +60,7 @@ struct i2c_sam0_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct i2c_sam0_dev_config *const)(dev)->config_info) + ((const struct i2c_sam0_dev_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_sam0_dev_data *const)(dev)->driver_data) diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index b3f6f908c30..b5c4646e791 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -68,7 +68,7 @@ struct i2c_sam_twi_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct i2c_sam_twi_dev_cfg *const)(dev)->config_info) + ((const struct i2c_sam_twi_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_sam_twi_dev_data *const)(dev)->driver_data) diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index 418b73ced33..f7d2513966a 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -68,7 +68,7 @@ struct i2c_sam_twihs_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct i2c_sam_twihs_dev_cfg *const)(dev)->config_info) + ((const struct i2c_sam_twihs_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2c_sam_twihs_dev_data *const)(dev)->driver_data) diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c index 65f1a221d10..84d73a73a7c 100644 --- a/drivers/i2c/i2c_sbcon.c +++ b/drivers/i2c/i2c_sbcon.c @@ -101,7 +101,7 @@ static struct i2c_driver_api api = { static int i2c_sbcon_init(struct device *dev) { struct i2c_sbcon_context *context = dev->driver_data; - const struct i2c_sbcon_config *config = dev->config_info; + const struct i2c_sbcon_config *config = dev->config; i2c_bitbang_init(&context->bitbang, &io_fns, config->sbcon); diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c index 2d394232d21..dc8eed2feec 100644 --- a/drivers/i2c/i2c_sifive.c +++ b/drivers/i2c/i2c_sifive.c @@ -69,7 +69,7 @@ struct i2c_sifive_cfg { static inline bool i2c_sifive_busy(struct device *dev) { - const struct i2c_sifive_cfg *config = dev->config_info; + const struct i2c_sifive_cfg *config = dev->config; return IS_SET(config, REG_STATUS, SF_STATUS_TIP); } @@ -78,7 +78,7 @@ static int i2c_sifive_send_addr(struct device *dev, uint16_t addr, uint16_t rw_flag) { - const struct i2c_sifive_cfg *config = dev->config_info; + const struct i2c_sifive_cfg *config = dev->config; uint8_t command = 0U; /* Wait for a previous transfer to complete */ @@ -109,7 +109,7 @@ static int i2c_sifive_write_msg(struct device *dev, struct i2c_msg *msg, uint16_t addr) { - const struct i2c_sifive_cfg *config = dev->config_info; + const struct i2c_sifive_cfg *config = dev->config; int rc = 0; uint8_t command = 0U; @@ -158,7 +158,7 @@ static int i2c_sifive_read_msg(struct device *dev, struct i2c_msg *msg, uint16_t addr) { - const struct i2c_sifive_cfg *config = dev->config_info; + const struct i2c_sifive_cfg *config = dev->config; uint8_t command = 0U; i2c_sifive_send_addr(dev, addr, SF_TX_READ); @@ -208,7 +208,7 @@ static int i2c_sifive_configure(struct device *dev, uint32_t dev_config) LOG_ERR("Device handle is NULL"); return -EINVAL; } - config = dev->config_info; + config = dev->config; if (config == NULL) { LOG_ERR("Device config is NULL"); return -EINVAL; @@ -274,7 +274,7 @@ static int i2c_sifive_transfer(struct device *dev, LOG_ERR("Device handle is NULL"); return -EINVAL; } - if (dev->config_info == NULL) { + if (dev->config == NULL) { LOG_ERR("Device config is NULL"); return -EINVAL; } @@ -300,7 +300,7 @@ static int i2c_sifive_transfer(struct device *dev, static int i2c_sifive_init(struct device *dev) { - const struct i2c_sifive_cfg *config = dev->config_info; + const struct i2c_sifive_cfg *config = dev->config; uint32_t dev_config = 0U; int rc = 0; diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c index b95840eaabb..b60c06fe4b3 100644 --- a/drivers/i2c/slave/eeprom_slave.c +++ b/drivers/i2c/slave/eeprom_slave.c @@ -36,7 +36,7 @@ struct i2c_eeprom_slave_config { /* convenience defines */ #define DEV_CFG(dev) \ ((const struct i2c_eeprom_slave_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_DATA(dev) \ ((struct i2c_eeprom_slave_data * const)(dev)->driver_data) diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c index 2f9ac75cadb..b3ad2ecb4c3 100644 --- a/drivers/i2s/i2s_cavs.c +++ b/drivers/i2s/i2s_cavs.c @@ -158,7 +158,7 @@ struct i2s_cavs_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct i2s_cavs_config *const)(dev)->config_info) + ((const struct i2s_cavs_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2s_cavs_dev_data *const)(dev)->driver_data) diff --git a/drivers/i2s/i2s_ll_stm32.h b/drivers/i2s/i2s_ll_stm32.h index 4b1141df1c2..5dca64107be 100644 --- a/drivers/i2s/i2s_ll_stm32.h +++ b/drivers/i2s/i2s_ll_stm32.h @@ -50,7 +50,7 @@ #endif /* CONFIG_I2S_STM32_USE_PLLI2S_ENABLE */ #define DEV_CFG(dev) \ - (const struct i2s_stm32_cfg * const)((dev)->config_info) + (const struct i2s_stm32_cfg * const)((dev)->config) #define DEV_DATA(dev) \ ((struct i2s_stm32_data *const)(dev)->driver_data) diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c index fd5ebb457ab..68cea1810d4 100644 --- a/drivers/i2s/i2s_sam_ssc.c +++ b/drivers/i2s/i2s_sam_ssc.c @@ -97,7 +97,7 @@ struct i2s_sam_dev_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct i2s_sam_dev_cfg *const)(dev)->config_info) + ((const struct i2s_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct i2s_sam_dev_data *const)(dev)->driver_data) diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c index 96a6ba0fd09..2f28a1ec546 100644 --- a/drivers/ieee802154/ieee802154_dw1000.c +++ b/drivers/ieee802154/ieee802154_dw1000.c @@ -956,7 +956,7 @@ static int dwt_configure(struct device *dev, enum ieee802154_config_type type, static int dwt_hw_reset(struct device *dev) { struct dwt_context *ctx = dev->driver_data; - const struct dwt_hi_cfg *hi_cfg = dev->config_info; + const struct dwt_hi_cfg *hi_cfg = dev->config; if (gpio_pin_configure(ctx->rst_gpio, hi_cfg->rst_pin, GPIO_OUTPUT_ACTIVE | hi_cfg->rst_flags)) { @@ -1490,7 +1490,7 @@ static int dwt_configure_rf_phy(struct dwt_context *ctx) static int dw1000_init(struct device *dev) { struct dwt_context *ctx = dev->driver_data; - const struct dwt_hi_cfg *hi_cfg = dev->config_info; + const struct dwt_hi_cfg *hi_cfg = dev->config; LOG_INF("Initialize DW1000 Transceiver"); k_sem_init(&ctx->phy_sem, 0, 1); diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c index 102dc5127bb..b58bff50d4b 100644 --- a/drivers/ieee802154/ieee802154_nrf5.c +++ b/drivers/ieee802154/ieee802154_nrf5.c @@ -58,7 +58,7 @@ static struct nrf5_802154_data nrf5_data; ((struct nrf5_802154_data * const)(dev)->driver_data) #define NRF5_802154_CFG(dev) \ - ((const struct nrf5_802154_config * const)(dev)->config_info) + ((const struct nrf5_802154_config * const)(dev)->config) #if CONFIG_IEEE802154_VENDOR_OUI_ENABLE #define IEEE802154_NRF5_VENDOR_OUI CONFIG_IEEE802154_VENDOR_OUI diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c index 21089b28aae..30194a35580 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.c +++ b/drivers/ieee802154/ieee802154_rf2xx.c @@ -349,7 +349,7 @@ static void rf2xx_thread_main(void *arg) static inline uint8_t *get_mac(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; struct rf2xx_context *ctx = dev->driver_data; uint32_t *ptr = (uint32_t *)(ctx->mac_addr); @@ -585,7 +585,7 @@ static int rf2xx_tx(struct device *dev, static int rf2xx_start(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; struct rf2xx_context *ctx = dev->driver_data; rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TRX_OFF); @@ -599,7 +599,7 @@ static int rf2xx_start(struct device *dev) static int rf2xx_stop(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; struct rf2xx_context *ctx = dev->driver_data; gpio_pin_interrupt_configure(ctx->irq_gpio, conf->irq.pin, @@ -622,7 +622,7 @@ int rf2xx_configure(struct device *dev, enum ieee802154_config_type type, static int power_on_and_setup(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; struct rf2xx_context *ctx = dev->driver_data; uint8_t config; @@ -692,7 +692,7 @@ static int power_on_and_setup(struct device *dev) static inline int configure_gpios(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; struct rf2xx_context *ctx = dev->driver_data; /* Chip IRQ line */ @@ -753,7 +753,7 @@ static inline int configure_gpios(struct device *dev) static inline int configure_spi(struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; /* Get SPI Driver Instance*/ ctx->spi = device_get_binding(conf->spi.devname); @@ -796,7 +796,7 @@ static inline int configure_spi(struct device *dev) static int rf2xx_init(struct device *dev) { struct rf2xx_context *ctx = dev->driver_data; - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; char thread_name[20]; LOG_DBG("\nInitialize RF2XX Transceiver\n"); diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.c b/drivers/ieee802154/ieee802154_rf2xx_iface.c index 82616742570..6ff2b2ce465 100644 --- a/drivers/ieee802154/ieee802154_rf2xx_iface.c +++ b/drivers/ieee802154/ieee802154_rf2xx_iface.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); void rf2xx_iface_phy_rst(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; const struct rf2xx_context *ctx = dev->driver_data; /* Ensure control lines have correct levels. */ @@ -41,7 +41,7 @@ void rf2xx_iface_phy_rst(struct device *dev) } void rf2xx_iface_phy_tx_start(struct device *dev) { - const struct rf2xx_config *conf = dev->config_info; + const struct rf2xx_config *conf = dev->config; const struct rf2xx_context *ctx = dev->driver_data; /* Start TX transmission at rise edge */ diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c index 3df1f8f64f8..0aae506e9f8 100644 --- a/drivers/interrupt_controller/intc_cavs.c +++ b/drivers/interrupt_controller/intc_cavs.c @@ -53,7 +53,7 @@ static void cavs_ictl_isr(void *arg) struct device *port = (struct device *)arg; struct cavs_ictl_runtime *context = port->driver_data; - const struct cavs_ictl_config *config = port->config_info; + const struct cavs_ictl_config *config = port->config; volatile struct cavs_registers * const regs = get_base_address(context); diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c index 217892ee600..dcdd476b109 100644 --- a/drivers/interrupt_controller/intc_dw.c +++ b/drivers/interrupt_controller/intc_dw.c @@ -35,7 +35,7 @@ static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(uint32_t intr_status, static int dw_ictl_initialize(struct device *dev) { - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -49,7 +49,7 @@ static int dw_ictl_initialize(struct device *dev) static void dw_ictl_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -64,7 +64,7 @@ static void dw_ictl_isr(void *arg) static inline void dw_ictl_intr_enable(struct device *dev, unsigned int irq) { - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -77,7 +77,7 @@ static inline void dw_ictl_intr_enable(struct device *dev, unsigned int irq) static inline void dw_ictl_intr_disable(struct device *dev, unsigned int irq) { - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -90,7 +90,7 @@ static inline void dw_ictl_intr_disable(struct device *dev, unsigned int irq) static inline unsigned int dw_ictl_intr_get_state(struct device *dev) { - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; @@ -108,7 +108,7 @@ static inline unsigned int dw_ictl_intr_get_state(struct device *dev) static int dw_ictl_intr_get_line_state(struct device *dev, unsigned int irq) { - const struct dw_ictl_config *config = dev->config_info; + const struct dw_ictl_config *config = dev->config; volatile struct dw_ictl_registers * const regs = (struct dw_ictl_registers *)config->base_addr; diff --git a/drivers/interrupt_controller/intc_rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c index 3acd5d1ecc1..8e59c47974b 100644 --- a/drivers/interrupt_controller/intc_rv32m1_intmux.c +++ b/drivers/interrupt_controller/intc_rv32m1_intmux.c @@ -46,7 +46,7 @@ struct rv32m1_intmux_config { }; #define DEV_CFG(dev) \ - ((struct rv32m1_intmux_config *)(dev->config_info)) + ((struct rv32m1_intmux_config *)(dev->config)) #define DEV_REGS(dev) (DEV_CFG(dev)->regs) diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c index 2789a265e27..012a193b191 100644 --- a/drivers/interrupt_controller/intc_shared_irq.c +++ b/drivers/interrupt_controller/intc_shared_irq.c @@ -28,7 +28,7 @@ static int isr_register(struct device *dev, isr_t isr_func, struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; - const struct shared_irq_config *config = dev->config_info; + const struct shared_irq_config *config = dev->config; uint32_t i; for (i = 0U; i < config->client_count; i++) { @@ -49,7 +49,7 @@ static int isr_register(struct device *dev, isr_t isr_func, static inline int enable(struct device *dev, struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; - const struct shared_irq_config *config = dev->config_info; + const struct shared_irq_config *config = dev->config; uint32_t i; for (i = 0U; i < config->client_count; i++) { @@ -81,7 +81,7 @@ static int last_enabled_isr(struct shared_irq_runtime *clients, int count) static inline int disable(struct device *dev, struct device *isr_dev) { struct shared_irq_runtime *clients = dev->driver_data; - const struct shared_irq_config *config = dev->config_info; + const struct shared_irq_config *config = dev->config; uint32_t i; for (i = 0U; i < config->client_count; i++) { @@ -99,7 +99,7 @@ static inline int disable(struct device *dev, struct device *isr_dev) void shared_irq_isr(struct device *dev) { struct shared_irq_runtime *clients = dev->driver_data; - const struct shared_irq_config *config = dev->config_info; + const struct shared_irq_config *config = dev->config; uint32_t i; for (i = 0U; i < config->client_count; i++) { @@ -118,7 +118,7 @@ static const struct shared_irq_driver_api api_funcs = { int shared_irq_initialize(struct device *dev) { - const struct shared_irq_config *config = dev->config_info; + const struct shared_irq_config *config = dev->config; config->config(); return 0; } diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c index c8414e131d9..570e5f9dd12 100644 --- a/drivers/ipm/ipm_imx.c +++ b/drivers/ipm/ipm_imx.c @@ -34,7 +34,7 @@ struct imx_mu_data { static void imx_mu_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct imx_mu_config *config = dev->config_info; + const struct imx_mu_config *config = dev->config; MU_Type *base = MU(config); struct imx_mu_data *data = dev->driver_data; uint32_t data32[IMX_IPM_DATA_REGS]; @@ -90,7 +90,7 @@ static void imx_mu_isr(void *arg) static int imx_mu_ipm_send(struct device *dev, int wait, uint32_t id, const void *data, int size) { - const struct imx_mu_config *config = dev->config_info; + const struct imx_mu_config *config = dev->config; MU_Type *base = MU(config); uint32_t data32[IMX_IPM_DATA_REGS]; mu_status_t status; @@ -150,7 +150,7 @@ static void imx_mu_ipm_register_callback(struct device *dev, static int imx_mu_ipm_set_enabled(struct device *dev, int enable) { - const struct imx_mu_config *config = dev->config_info; + const struct imx_mu_config *config = dev->config; MU_Type *base = MU(config); #if CONFIG_IPM_IMX_MAX_DATA_SIZE_4 @@ -188,7 +188,7 @@ static int imx_mu_ipm_set_enabled(struct device *dev, int enable) static int imx_mu_init(struct device *dev) { - const struct imx_mu_config *config = dev->config_info; + const struct imx_mu_config *config = dev->config; MU_Init(MU(config)); config->irq_config_func(dev); diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c index 6d5c6ae84be..076e7f6de69 100644 --- a/drivers/ipm/ipm_mcux.c +++ b/drivers/ipm/ipm_mcux.c @@ -38,7 +38,7 @@ static void mcux_mailbox_isr(void *arg) { struct device *dev = arg; struct mcux_mailbox_data *data = dev->driver_data; - const struct mcux_mailbox_config *config = dev->config_info; + const struct mcux_mailbox_config *config = dev->config; mailbox_cpu_id_t cpu_id; cpu_id = MAILBOX_ID_THIS_CPU; @@ -67,7 +67,7 @@ static void mcux_mailbox_isr(void *arg) static int mcux_mailbox_ipm_send(struct device *d, int wait, uint32_t id, const void *data, int size) { - const struct mcux_mailbox_config *config = d->config_info; + const struct mcux_mailbox_config *config = d->config; MAILBOX_Type *base = config->base; uint32_t data32[MCUX_IPM_DATA_REGS]; /* Until we change API * to uint32_t array @@ -135,7 +135,7 @@ static int mcux_mailbox_ipm_set_enabled(struct device *d, int enable) static int mcux_mailbox_init(struct device *dev) { - const struct mcux_mailbox_config *config = dev->config_info; + const struct mcux_mailbox_config *config = dev->config; MAILBOX_Init(config->base); config->irq_config_func(dev); diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c index 4bd9a3fe207..7d160a49969 100644 --- a/drivers/ipm/ipm_mhu.c +++ b/drivers/ipm/ipm_mhu.c @@ -12,7 +12,7 @@ #include "ipm_mhu.h" #define DEV_CFG(dev) \ - ((const struct ipm_mhu_device_config * const)(dev)->config_info) + ((const struct ipm_mhu_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct ipm_mhu_data *)(dev)->driver_data) #define IPM_MHU_REGS(dev) \ diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c index 01258d1bb97..86885d5bf86 100644 --- a/drivers/ipm/ipm_stm32_ipcc.c +++ b/drivers/ipm/ipm_stm32_ipcc.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(ipm_stm32_ipcc, CONFIG_IPM_LOG_LEVEL); /* convenience defines */ #define DEV_CFG(dev) \ - ((const struct stm32_ipcc_mailbox_config * const)(dev)->config_info) + ((const struct stm32_ipcc_mailbox_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct stm32_ipcc_mbx_data * const)(dev)->driver_data) #define MBX_STRUCT(dev) \ diff --git a/drivers/kscan/kscan_ft5336.c b/drivers/kscan/kscan_ft5336.c index d26f4790703..9a3262e9e05 100644 --- a/drivers/kscan/kscan_ft5336.c +++ b/drivers/kscan/kscan_ft5336.c @@ -49,7 +49,7 @@ struct ft5336_data { static int ft5336_read(struct device *dev) { - const struct ft5336_config *config = dev->config_info; + const struct ft5336_config *config = dev->config; struct ft5336_data *data = dev->driver_data; uint8_t buffer[FT5406_DATA_SIZE]; uint8_t event; @@ -102,7 +102,7 @@ static void ft5336_work_handler(struct k_work *work) static void ft5336_isr_handler(struct device *dev, struct gpio_callback *cb, uint32_t pins) { - const struct ft5336_config *config = dev->config_info; + const struct ft5336_config *config = dev->config; struct ft5336_data *drv_data = CONTAINER_OF(cb, struct ft5336_data, int_gpio_cb); @@ -155,7 +155,7 @@ static int ft5336_disable_callback(struct device *dev) static int ft5336_init(struct device *dev) { - const struct ft5336_config *config = dev->config_info; + const struct ft5336_config *config = dev->config; struct ft5336_data *data = dev->driver_data; data->i2c = device_get_binding(config->i2c_name); diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c index b5e80afb707..ecaafbc04d6 100644 --- a/drivers/led/ht16k33.c +++ b/drivers/led/ht16k33.c @@ -100,7 +100,7 @@ static int ht16k33_led_blink(struct device *dev, uint32_t led, /* The HT16K33 blinks all LEDs at the same frequency */ ARG_UNUSED(led); - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; uint32_t period; @@ -135,7 +135,7 @@ static int ht16k33_led_set_brightness(struct device *dev, uint32_t led, { ARG_UNUSED(led); - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; uint8_t dim; @@ -159,7 +159,7 @@ static int ht16k33_led_set_brightness(struct device *dev, uint32_t led, static int ht16k33_led_set_state(struct device *dev, uint32_t led, bool on) { - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; uint8_t cmd[2]; uint8_t addr; @@ -206,7 +206,7 @@ static int ht16k33_led_off(struct device *dev, uint32_t led) #ifdef CONFIG_HT16K33_KEYSCAN uint32_t ht16k33_get_pending_int(struct device *dev) { - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; uint8_t cmd; uint8_t flag; @@ -225,7 +225,7 @@ uint32_t ht16k33_get_pending_int(struct device *dev) static bool ht16k33_process_keyscan_data(struct device *dev) { - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; uint8_t keys[HT16K33_KEYSCAN_DATA_SIZE]; bool pressed = false; @@ -321,7 +321,7 @@ int ht16k33_register_keyscan_device(struct device *parent, static int ht16k33_init(struct device *dev) { - const struct ht16k33_cfg *config = dev->config_info; + const struct ht16k33_cfg *config = dev->config; struct ht16k33_data *data = dev->driver_data; struct led_data *dev_data = &data->dev_data; uint8_t cmd[1 + HT16K33_DISP_DATA_SIZE]; /* 1 byte command + data */ diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c index 6e32b495627..85f05b88436 100644 --- a/drivers/led_strip/ws2812_gpio.c +++ b/drivers/led_strip/ws2812_gpio.c @@ -38,7 +38,7 @@ static struct ws2812_gpio_data *dev_data(struct device *dev) static const struct ws2812_gpio_cfg *dev_cfg(struct device *dev) { - return dev->config_info; + return dev->config; } /* @@ -156,7 +156,7 @@ static int send_buf(struct device *dev, uint8_t *buf, size_t len) static int ws2812_gpio_update_rgb(struct device *dev, struct led_rgb *pixels, size_t num_pixels) { - const struct ws2812_gpio_cfg *config = dev->config_info; + const struct ws2812_gpio_cfg *config = dev->config; const bool has_white = config->has_white; uint8_t *ptr = (uint8_t *)pixels; size_t i; diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c index e31943c9dd8..3279ba64fa8 100644 --- a/drivers/led_strip/ws2812_spi.c +++ b/drivers/led_strip/ws2812_spi.c @@ -64,7 +64,7 @@ static struct ws2812_spi_data *dev_data(struct device *dev) static const struct ws2812_spi_cfg *dev_cfg(struct device *dev) { - return dev->config_info; + return dev->config; } /* diff --git a/drivers/neural_net/intel_gna.c b/drivers/neural_net/intel_gna.c index 7de1310d5ee..3e7c96ba53e 100644 --- a/drivers/neural_net/intel_gna.c +++ b/drivers/neural_net/intel_gna.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(neural_net); #define DEV_NAME(dev) ((dev)->name) #define DEV_CFG(dev) \ - ((const struct intel_gna_config *const)(dev)->config_info) + ((const struct intel_gna_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct intel_gna_data *const)(dev)->driver_data) diff --git a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c index c53e6d412ba..cf6814d0461 100644 --- a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c +++ b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(iproc_pcie); static int iproc_pcie_conf_read(struct device *dev, uint32_t offset, uint32_t *data) { - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; /* Write offset to Configuration Indirect Address register */ pcie_write32(offset, &cfg->base->paxb_config_ind_addr); @@ -38,7 +38,7 @@ static int iproc_pcie_conf_read(struct device *dev, uint32_t offset, static void iproc_pcie_conf_write(struct device *dev, uint32_t offset, uint32_t data) { - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; /* Write offset to Configuration Indirect Address register */ pcie_write32(offset, &cfg->base->paxb_config_ind_addr); @@ -51,7 +51,7 @@ static int iproc_pcie_map_addr(struct device *dev, uint64_t pcie_addr, uint64_t *mapped_addr, uint32_t size, enum pcie_ob_mem_type ob_mem_type) { - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; struct iproc_pcie_ep_ctx *ctx = dev->driver_data; uint64_t pcie_ob_base, pcie_ob_size, pcie_addr_start, offset; uint32_t mapped_size; @@ -175,7 +175,7 @@ static int iproc_pcie_generate_msi(struct device *dev, const uint32_t msi_num) PCIE_OB_LOWMEM, DEVICE_TO_HOST); #else - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; pcie_write32(msi_num, &cfg->base->paxb_pcie_sys_msi_req); #endif @@ -304,7 +304,7 @@ static void iproc_pcie_hot_reset(void *arg) static void iproc_pcie_flr(void *arg) { struct device *dev = arg; - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; struct iproc_pcie_ep_ctx *ctx = dev->driver_data; void *reset_data; uint32_t data; @@ -341,7 +341,7 @@ DEVICE_DECLARE(iproc_pcie_ep_0); static void iproc_pcie_reset_config(struct device *dev) { uint32_t data; - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; /* Clear any possible prior pending interrupts */ sys_write32(PCIE0_PERST_INTR | PCIE0_PERST_INB_INTR, @@ -429,7 +429,7 @@ static int iproc_pcie_mode_check(const struct iproc_pcie_ep_config *cfg) static int iproc_pcie_ep_init(struct device *dev) { - const struct iproc_pcie_ep_config *cfg = dev->config_info; + const struct iproc_pcie_ep_config *cfg = dev->config; struct iproc_pcie_ep_ctx *ctx = dev->driver_data; int ret; uint32_t data; diff --git a/drivers/pinmux/pinmux_lpc11u6x.c b/drivers/pinmux/pinmux_lpc11u6x.c index dc65db98b3e..eb5898468a2 100644 --- a/drivers/pinmux/pinmux_lpc11u6x.c +++ b/drivers/pinmux/pinmux_lpc11u6x.c @@ -24,7 +24,7 @@ #define DEV_CFG(dev) ((const struct pinmux_lpc11u6x_config *) \ - ((dev)->config_info)) + ((dev)->config)) struct pinmux_lpc11u6x_config { uint8_t port; diff --git a/drivers/pinmux/pinmux_mchp_xec.c b/drivers/pinmux/pinmux_mchp_xec.c index 129549a47a5..90f7a0b014f 100644 --- a/drivers/pinmux/pinmux_mchp_xec.c +++ b/drivers/pinmux/pinmux_mchp_xec.c @@ -25,7 +25,7 @@ struct pinmux_xec_config { static int pinmux_xec_set(struct device *dev, uint32_t pin, uint32_t func) { - const struct pinmux_xec_config *config = dev->config_info; + const struct pinmux_xec_config *config = dev->config; __IO uint32_t *current_pcr1; uint32_t pcr1 = 0; uint32_t mask = 0; @@ -78,7 +78,7 @@ static int pinmux_xec_set(struct device *dev, uint32_t pin, uint32_t func) static int pinmux_xec_get(struct device *dev, uint32_t pin, uint32_t *func) { - const struct pinmux_xec_config *config = dev->config_info; + const struct pinmux_xec_config *config = dev->config; __IO uint32_t *current_pcr1; /* Validate pin number in terms of current port */ diff --git a/drivers/pinmux/pinmux_mcux.c b/drivers/pinmux/pinmux_mcux.c index a231ca4ce88..3a87bed9569 100644 --- a/drivers/pinmux/pinmux_mcux.c +++ b/drivers/pinmux/pinmux_mcux.c @@ -17,7 +17,7 @@ struct pinmux_mcux_config { static int pinmux_mcux_set(struct device *dev, uint32_t pin, uint32_t func) { - const struct pinmux_mcux_config *config = dev->config_info; + const struct pinmux_mcux_config *config = dev->config; PORT_Type *base = config->base; base->PCR[pin] = func; @@ -27,7 +27,7 @@ static int pinmux_mcux_set(struct device *dev, uint32_t pin, uint32_t func) static int pinmux_mcux_get(struct device *dev, uint32_t pin, uint32_t *func) { - const struct pinmux_mcux_config *config = dev->config_info; + const struct pinmux_mcux_config *config = dev->config; PORT_Type *base = config->base; *func = base->PCR[pin]; @@ -47,7 +47,7 @@ static int pinmux_mcux_input(struct device *dev, uint32_t pin, uint8_t func) static int pinmux_mcux_init(struct device *dev) { - const struct pinmux_mcux_config *config = dev->config_info; + const struct pinmux_mcux_config *config = dev->config; CLOCK_EnableClock(config->clock_ip_name); diff --git a/drivers/pinmux/pinmux_mcux_lpc.c b/drivers/pinmux/pinmux_mcux_lpc.c index bd73a40f7f5..150bf71171b 100644 --- a/drivers/pinmux/pinmux_mcux_lpc.c +++ b/drivers/pinmux/pinmux_mcux_lpc.c @@ -27,7 +27,7 @@ struct pinmux_mcux_lpc_config { static int pinmux_mcux_lpc_set(struct device *dev, uint32_t pin, uint32_t func) { - const struct pinmux_mcux_lpc_config *config = dev->config_info; + const struct pinmux_mcux_lpc_config *config = dev->config; #ifdef IOPCTL IOPCTL_Type *base = config->base; #else @@ -42,7 +42,7 @@ static int pinmux_mcux_lpc_set(struct device *dev, uint32_t pin, uint32_t func) static int pinmux_mcux_lpc_get(struct device *dev, uint32_t pin, uint32_t *func) { - const struct pinmux_mcux_lpc_config *config = dev->config_info; + const struct pinmux_mcux_lpc_config *config = dev->config; #ifdef IOPCTL IOPCTL_Type *base = config->base; #else @@ -68,7 +68,7 @@ static int pinmux_mcux_lpc_input(struct device *dev, uint32_t pin, uint8_t func) static int pinmux_mcux_lpc_init(struct device *dev) { #ifndef IOPCTL - const struct pinmux_mcux_lpc_config *config = dev->config_info; + const struct pinmux_mcux_lpc_config *config = dev->config; CLOCK_EnableClock(config->clock_ip_name); #endif diff --git a/drivers/pinmux/pinmux_rv32m1.c b/drivers/pinmux/pinmux_rv32m1.c index 37bbee0cbfc..69b2a2a08e3 100644 --- a/drivers/pinmux/pinmux_rv32m1.c +++ b/drivers/pinmux/pinmux_rv32m1.c @@ -21,7 +21,7 @@ struct pinmux_rv32m1_config { static int pinmux_rv32m1_set(struct device *dev, uint32_t pin, uint32_t func) { - const struct pinmux_rv32m1_config *config = dev->config_info; + const struct pinmux_rv32m1_config *config = dev->config; PORT_Type *base = config->base; base->PCR[pin] = (base->PCR[pin] & ~PORT_PCR_MUX_MASK) | func; @@ -31,7 +31,7 @@ static int pinmux_rv32m1_set(struct device *dev, uint32_t pin, uint32_t func) static int pinmux_rv32m1_get(struct device *dev, uint32_t pin, uint32_t *func) { - const struct pinmux_rv32m1_config *config = dev->config_info; + const struct pinmux_rv32m1_config *config = dev->config; PORT_Type *base = config->base; *func = base->PCR[pin] & ~PORT_PCR_MUX_MASK; @@ -51,7 +51,7 @@ static int pinmux_rv32m1_input(struct device *dev, uint32_t pin, uint8_t func) static int pinmux_rv32m1_init(struct device *dev) { - const struct pinmux_rv32m1_config *config = dev->config_info; + const struct pinmux_rv32m1_config *config = dev->config; CLOCK_EnableClock(config->clock_ip_name); diff --git a/drivers/pinmux/pinmux_sam0.c b/drivers/pinmux/pinmux_sam0.c index 5407c45346c..96a168e4802 100644 --- a/drivers/pinmux/pinmux_sam0.c +++ b/drivers/pinmux/pinmux_sam0.c @@ -13,7 +13,7 @@ struct pinmux_sam0_config { static int pinmux_sam0_set(struct device *dev, uint32_t pin, uint32_t func) { - const struct pinmux_sam0_config *cfg = dev->config_info; + const struct pinmux_sam0_config *cfg = dev->config; bool odd_pin = pin & 1; int idx = pin / 2U; @@ -33,7 +33,7 @@ static int pinmux_sam0_set(struct device *dev, uint32_t pin, uint32_t func) static int pinmux_sam0_get(struct device *dev, uint32_t pin, uint32_t *func) { - const struct pinmux_sam0_config *cfg = dev->config_info; + const struct pinmux_sam0_config *cfg = dev->config; bool odd_pin = pin & 1; int idx = pin / 2U; diff --git a/drivers/pinmux/pinmux_sifive.c b/drivers/pinmux/pinmux_sifive.c index 03f9c006243..e605ccc8a6d 100644 --- a/drivers/pinmux/pinmux_sifive.c +++ b/drivers/pinmux/pinmux_sifive.c @@ -24,7 +24,7 @@ struct pinmux_sifive_regs_t { #define DEV_CFG(dev) \ ((const struct pinmux_sifive_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_PINMUX(dev) \ ((struct pinmux_sifive_regs_t *)(DEV_CFG(dev))->base) diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c index 8517e36bc39..e5fcc4b9b27 100644 --- a/drivers/ps2/ps2_mchp_xec.c +++ b/drivers/ps2/ps2_mchp_xec.c @@ -32,7 +32,7 @@ struct ps2_xec_data { static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr) { - const struct ps2_xec_config *config = dev->config_info; + const struct ps2_xec_config *config = dev->config; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; @@ -69,7 +69,7 @@ static int ps2_xec_configure(struct device *dev, ps2_callback_t callback_isr) static int ps2_xec_write(struct device *dev, uint8_t value) { - const struct ps2_xec_config *config = dev->config_info; + const struct ps2_xec_config *config = dev->config; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; int i = 0; @@ -118,7 +118,7 @@ static int ps2_xec_write(struct device *dev, uint8_t value) static int ps2_xec_inhibit_interface(struct device *dev) { - const struct ps2_xec_config *config = dev->config_info; + const struct ps2_xec_config *config = dev->config; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; @@ -137,7 +137,7 @@ static int ps2_xec_inhibit_interface(struct device *dev) static int ps2_xec_enable_interface(struct device *dev) { - const struct ps2_xec_config *config = dev->config_info; + const struct ps2_xec_config *config = dev->config; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; @@ -151,7 +151,7 @@ static int ps2_xec_enable_interface(struct device *dev) static void ps2_xec_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct ps2_xec_config *config = dev->config_info; + const struct ps2_xec_config *config = dev->config; struct ps2_xec_data *data = dev->driver_data; PS2_Type *base = config->base; uint32_t status; diff --git a/drivers/pwm/pwm_dw.c b/drivers/pwm/pwm_dw.c index b60f4fa9334..e6d5d5d06d4 100644 --- a/drivers/pwm/pwm_dw.c +++ b/drivers/pwm/pwm_dw.c @@ -73,7 +73,7 @@ struct pwm_dw_config { static inline int pwm_dw_timer_base_addr(struct device *dev, uint32_t timer) { const struct pwm_dw_config * const cfg = - (const struct pwm_dw_config *)dev->config_info; + (const struct pwm_dw_config *)dev->config; return (cfg->addr + (timer * REG_OFFSET)); } @@ -89,7 +89,7 @@ static inline int pwm_dw_timer_base_addr(struct device *dev, uint32_t timer) static inline int pwm_dw_timer_ldcnt2_addr(struct device *dev, uint32_t timer) { const struct pwm_dw_config * const cfg = - (const struct pwm_dw_config *)dev->config_info; + (const struct pwm_dw_config *)dev->config; return (cfg->addr + REG_TMR_LOAD_CNT2 + (timer * REG_OFFSET_LOAD_CNT2)); } @@ -144,7 +144,7 @@ static int pwm_dw_pin_set_cycles(struct device *dev, uint32_t pulse_cycles, pwm_flags_t flags) { const struct pwm_dw_config * const cfg = - (const struct pwm_dw_config *)dev->config_info; + (const struct pwm_dw_config *)dev->config; int i; uint32_t on, off; diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c index 18bdeaf9e0f..c7661313a3e 100644 --- a/drivers/pwm/pwm_imx.c +++ b/drivers/pwm/pwm_imx.c @@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(pwm_imx); <config_info) + ((const struct imx_pwm_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct imx_pwm_data * const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/pwm/pwm_led_esp32.c b/drivers/pwm/pwm_led_esp32.c index 2bcfac5c722..bb128ad34ba 100644 --- a/drivers/pwm/pwm_led_esp32.c +++ b/drivers/pwm/pwm_led_esp32.c @@ -320,7 +320,7 @@ static int pwm_led_esp32_pin_set_cycles(struct device *dev, int timer; int ret; const struct pwm_led_esp32_config * const config = - (const struct pwm_led_esp32_config *) dev->config_info; + (const struct pwm_led_esp32_config *) dev->config; ARG_UNUSED(period_cycles); @@ -373,7 +373,7 @@ static int pwm_led_esp32_get_cycles_per_sec(struct device *dev, uint32_t pwm, int timer; int speed_mode; - config = (const struct pwm_led_esp32_config *) dev->config_info; + config = (const struct pwm_led_esp32_config *) dev->config; channel = pwm_led_esp32_get_gpio_config(pwm, config->ch_cfg); if (channel < 0) { diff --git a/drivers/pwm/pwm_litex.c b/drivers/pwm/pwm_litex.c index 6b359b04a82..d244672dca0 100644 --- a/drivers/pwm/pwm_litex.c +++ b/drivers/pwm/pwm_litex.c @@ -26,7 +26,7 @@ struct pwm_litex_cfg { }; #define GET_PWM_CFG(dev) \ - ((const struct pwm_litex_cfg *) dev->config_info) + ((const struct pwm_litex_cfg *) dev->config) static void litex_set_reg(volatile uint32_t *reg, uint32_t reg_size, uint32_t val) { diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c index 7cf831c10a3..a0ecd41eb84 100644 --- a/drivers/pwm/pwm_mchp_xec.c +++ b/drivers/pwm/pwm_mchp_xec.c @@ -49,11 +49,11 @@ struct pwm_xec_config { #define PWM_XEC_REG_BASE(_dev) \ ((PWM_Type *) \ ((const struct pwm_xec_config * const) \ - _dev->config_info)->base_address) + _dev->config)->base_address) #define PWM_XEC_CONFIG(_dev) \ (((const struct pwm_xec_config * const) \ - _dev->config_info)) + _dev->config)) struct xec_params { uint32_t on; diff --git a/drivers/pwm/pwm_mcux.c b/drivers/pwm/pwm_mcux.c index fd288ce5d4a..cd800f4fa80 100644 --- a/drivers/pwm/pwm_mcux.c +++ b/drivers/pwm/pwm_mcux.c @@ -35,7 +35,7 @@ static int mcux_pwm_pin_set(struct device *dev, uint32_t pwm, uint32_t period_cycles, uint32_t pulse_cycles, pwm_flags_t flags) { - const struct pwm_mcux_config *config = dev->config_info; + const struct pwm_mcux_config *config = dev->config; struct pwm_mcux_data *data = dev->driver_data; uint8_t duty_cycle; @@ -111,7 +111,7 @@ static int mcux_pwm_pin_set(struct device *dev, uint32_t pwm, static int mcux_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles) { - const struct pwm_mcux_config *config = dev->config_info; + const struct pwm_mcux_config *config = dev->config; *cycles = CLOCK_GetFreq(config->clock_source) >> config->prescale; @@ -120,7 +120,7 @@ static int mcux_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm, static int pwm_mcux_init(struct device *dev) { - const struct pwm_mcux_config *config = dev->config_info; + const struct pwm_mcux_config *config = dev->config; struct pwm_mcux_data *data = dev->driver_data; pwm_config_t pwm_config; status_t status; diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c index e4456c6e3bf..56ea01c5958 100644 --- a/drivers/pwm/pwm_mcux_ftm.c +++ b/drivers/pwm/pwm_mcux_ftm.c @@ -39,7 +39,7 @@ static int mcux_ftm_pin_set(struct device *dev, uint32_t pwm, uint32_t period_cycles, uint32_t pulse_cycles, pwm_flags_t flags) { - const struct mcux_ftm_config *config = dev->config_info; + const struct mcux_ftm_config *config = dev->config; struct mcux_ftm_data *data = dev->driver_data; status_t status; @@ -98,7 +98,7 @@ static int mcux_ftm_pin_set(struct device *dev, uint32_t pwm, static int mcux_ftm_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles) { - const struct mcux_ftm_config *config = dev->config_info; + const struct mcux_ftm_config *config = dev->config; struct mcux_ftm_data *data = dev->driver_data; *cycles = data->clock_freq >> config->prescale; @@ -108,7 +108,7 @@ static int mcux_ftm_get_cycles_per_sec(struct device *dev, uint32_t pwm, static int mcux_ftm_init(struct device *dev) { - const struct mcux_ftm_config *config = dev->config_info; + const struct mcux_ftm_config *config = dev->config; struct mcux_ftm_data *data = dev->driver_data; ftm_chnl_pwm_config_param_t *channel = data->channel; struct device *clock_dev; diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c index 6bcf7c04450..cce247622eb 100644 --- a/drivers/pwm/pwm_mcux_tpm.c +++ b/drivers/pwm/pwm_mcux_tpm.c @@ -43,7 +43,7 @@ static int mcux_tpm_pin_set(struct device *dev, uint32_t pwm, uint32_t period_cycles, uint32_t pulse_cycles, pwm_flags_t flags) { - const struct mcux_tpm_config *config = dev->config_info; + const struct mcux_tpm_config *config = dev->config; struct mcux_tpm_data *data = dev->driver_data; uint8_t duty_cycle; @@ -119,7 +119,7 @@ static int mcux_tpm_pin_set(struct device *dev, uint32_t pwm, static int mcux_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles) { - const struct mcux_tpm_config *config = dev->config_info; + const struct mcux_tpm_config *config = dev->config; struct mcux_tpm_data *data = dev->driver_data; *cycles = data->clock_freq >> config->prescale; @@ -129,7 +129,7 @@ static int mcux_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm, static int mcux_tpm_init(struct device *dev) { - const struct mcux_tpm_config *config = dev->config_info; + const struct mcux_tpm_config *config = dev->config; struct mcux_tpm_data *data = dev->driver_data; tpm_chnl_pwm_signal_param_t *channel = data->channel; struct device *clock_dev; diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c index b9700f64b50..0feb5f686af 100644 --- a/drivers/pwm/pwm_nrf5_sw.c +++ b/drivers/pwm/pwm_nrf5_sw.c @@ -100,7 +100,7 @@ static int pwm_nrf5_sw_pin_set(struct device *dev, uint32_t pwm, uint16_t div; uint32_t ret; - config = (const struct pwm_config *)dev->config_info; + config = (const struct pwm_config *)dev->config; timer = config->timer; data = dev->driver_data; @@ -218,7 +218,7 @@ static int pwm_nrf5_sw_get_cycles_per_sec(struct device *dev, uint32_t pwm, { const struct pwm_config *config; - config = (const struct pwm_config *)dev->config_info; + config = (const struct pwm_config *)dev->config; /* HF timer frequency is derived from 16MHz source with a prescaler */ *cycles = 16000000UL / BIT(config->prescaler); @@ -236,7 +236,7 @@ static int pwm_nrf5_sw_init(struct device *dev) const struct pwm_config *config; NRF_TIMER_Type *timer; - config = (const struct pwm_config *)dev->config_info; + config = (const struct pwm_config *)dev->config; timer = config->timer; /* setup HF timer */ diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index 868625af14e..c587fd9b8ca 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -131,7 +131,7 @@ static int pwm_nrfx_pin_set(struct device *dev, uint32_t pwm, * be removed, see ISSUE #6958. * TODO: Remove this comment when issue has been resolved. */ - const struct pwm_nrfx_config *config = dev->config_info; + const struct pwm_nrfx_config *config = dev->config; struct pwm_nrfx_data *data = dev->driver_data; uint8_t channel; bool was_stopped; @@ -267,7 +267,7 @@ static const struct pwm_driver_api pwm_nrfx_drv_api_funcs = { static int pwm_nrfx_init(struct device *dev) { - const struct pwm_nrfx_config *config = dev->config_info; + const struct pwm_nrfx_config *config = dev->config; nrfx_err_t result = nrfx_pwm_init(&config->pwm, &config->initial_config, @@ -285,7 +285,7 @@ static int pwm_nrfx_init(struct device *dev) static void pwm_nrfx_uninit(struct device *dev) { - const struct pwm_nrfx_config *config = dev->config_info; + const struct pwm_nrfx_config *config = dev->config; nrfx_pwm_uninit(&config->pwm); } diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c index 5f75fe7787c..b730af11e2a 100644 --- a/drivers/pwm/pwm_pca9685.c +++ b/drivers/pwm/pwm_pca9685.c @@ -65,7 +65,7 @@ static int pwm_pca9685_pin_set_cycles(struct device *dev, uint32_t pwm, pwm_flags_t flags) { const struct pwm_pca9685_config * const config = - dev->config_info; + dev->config; struct pwm_pca9685_drv_data * const drv_data = (struct pwm_pca9685_drv_data * const)dev->driver_data; struct device * const i2c_master = drv_data->i2c_master; @@ -128,7 +128,7 @@ static const struct pwm_driver_api pwm_pca9685_drv_api_funcs = { int pwm_pca9685_init(struct device *dev) { const struct pwm_pca9685_config * const config = - dev->config_info; + dev->config; struct pwm_pca9685_drv_data * const drv_data = (struct pwm_pca9685_drv_data * const)dev->driver_data; struct device *i2c_master; diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c index 8acce492870..d3b6fa91166 100644 --- a/drivers/pwm/pwm_rv32m1_tpm.c +++ b/drivers/pwm/pwm_rv32m1_tpm.c @@ -42,7 +42,7 @@ static int rv32m1_tpm_pin_set(struct device *dev, uint32_t pwm, uint32_t period_cycles, uint32_t pulse_cycles, pwm_flags_t flags) { - const struct rv32m1_tpm_config *config = dev->config_info; + const struct rv32m1_tpm_config *config = dev->config; struct rv32m1_tpm_data *data = dev->driver_data; uint8_t duty_cycle; @@ -118,7 +118,7 @@ static int rv32m1_tpm_pin_set(struct device *dev, uint32_t pwm, static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles) { - const struct rv32m1_tpm_config *config = dev->config_info; + const struct rv32m1_tpm_config *config = dev->config; struct rv32m1_tpm_data *data = dev->driver_data; *cycles = data->clock_freq >> config->prescale; @@ -128,7 +128,7 @@ static int rv32m1_tpm_get_cycles_per_sec(struct device *dev, uint32_t pwm, static int rv32m1_tpm_init(struct device *dev) { - const struct rv32m1_tpm_config *config = dev->config_info; + const struct rv32m1_tpm_config *config = dev->config; struct rv32m1_tpm_data *data = dev->driver_data; tpm_chnl_pwm_signal_param_t *channel = data->channel; struct device *clock_dev; diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c index e2286395d0d..30593b92a85 100644 --- a/drivers/pwm/pwm_sam.c +++ b/drivers/pwm/pwm_sam.c @@ -23,7 +23,7 @@ struct sam_pwm_config { }; #define DEV_CFG(dev) \ - ((const struct sam_pwm_config * const)(dev)->config_info) + ((const struct sam_pwm_config * const)(dev)->config) static int sam_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm, uint64_t *cycles) diff --git a/drivers/pwm/pwm_sam0_tcc.c b/drivers/pwm/pwm_sam0_tcc.c index b9f7e224dcc..35b7e272ec5 100644 --- a/drivers/pwm/pwm_sam0_tcc.c +++ b/drivers/pwm/pwm_sam0_tcc.c @@ -34,7 +34,7 @@ struct pwm_sam0_config { #endif }; -#define DEV_CFG(dev) ((const struct pwm_sam0_config *const)(dev)->config_info) +#define DEV_CFG(dev) ((const struct pwm_sam0_config *const)(dev)->config) /* Wait for the peripheral to finish all commands */ static void wait_synchronization(Tcc *regs) diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c index d454ad62142..0951001c712 100644 --- a/drivers/pwm/pwm_sifive.c +++ b/drivers/pwm/pwm_sifive.c @@ -70,7 +70,7 @@ static inline void sys_set_mask(mem_addr_t addr, uint32_t mask, uint32_t value) static int pwm_sifive_init(struct device *dev) { - const struct pwm_sifive_cfg *config = dev->config_info; + const struct pwm_sifive_cfg *config = dev->config; /* When pwms == pwmcmp0, reset the counter */ sys_set_bit(PWM_REG(config, REG_PWMCFG), SF_PWMZEROCMP); @@ -116,7 +116,7 @@ static int pwm_sifive_pin_set(struct device *dev, return -ENOTSUP; } - config = dev->config_info; + config = dev->config; if (config == NULL) { LOG_ERR("The device configuration is NULL\n"); return -EFAULT; @@ -199,7 +199,7 @@ static int pwm_sifive_get_cycles_per_sec(struct device *dev, return -EFAULT; } - config = dev->config_info; + config = dev->config; if (config == NULL) { LOG_ERR("The device configuration is NULL\n"); return -EFAULT; diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index 5450ef25230..32032c3992e 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -82,7 +82,7 @@ static inline struct pwm_stm32_data *to_data(struct device *dev) static inline const struct pwm_stm32_config *to_config(struct device *dev) { - return dev->config_info; + return dev->config; } /** diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c index 92530482d69..6075d0eac53 100644 --- a/drivers/sensor/adt7420/adt7420.c +++ b/drivers/sensor/adt7420/adt7420.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(ADT7420, CONFIG_SENSOR_LOG_LEVEL); static int adt7420_temp_reg_read(struct device *dev, uint8_t reg, int16_t *val) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, reg, (uint8_t *) val, 2) < 0) { @@ -37,7 +37,7 @@ static int adt7420_temp_reg_read(struct device *dev, uint8_t reg, int16_t *val) static int adt7420_temp_reg_write(struct device *dev, uint8_t reg, int16_t val) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; uint8_t buf[3] = {reg, val >> 8, val & 0xFF}; return i2c_write(drv_data->i2c, buf, sizeof(buf), cfg->i2c_addr); @@ -49,7 +49,7 @@ static int adt7420_attr_set(struct device *dev, const struct sensor_value *val) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; uint8_t val8, reg = 0U; uint16_t rate; int64_t value; @@ -157,7 +157,7 @@ static const struct sensor_driver_api adt7420_driver_api = { static int adt7420_probe(struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; uint8_t value; int ret; @@ -203,7 +203,7 @@ static int adt7420_probe(struct device *dev) static int adt7420_init(struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; drv_data->i2c = device_get_binding(cfg->i2c_port); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c index 6ee977b6152..e1b8495a8df 100644 --- a/drivers/sensor/adt7420/adt7420_trigger.c +++ b/drivers/sensor/adt7420/adt7420_trigger.c @@ -20,7 +20,7 @@ static void setup_int(struct device *dev, bool enable) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; gpio_flags_t flags = enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE; @@ -44,7 +44,7 @@ static void handle_int(struct device *dev) static void process_int(struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; uint8_t status; /* Clear the status */ @@ -105,7 +105,7 @@ int adt7420_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; setup_int(dev, false); @@ -134,7 +134,7 @@ int adt7420_trigger_set(struct device *dev, int adt7420_init_interrupt(struct device *dev) { struct adt7420_data *drv_data = dev->driver_data; - const struct adt7420_dev_config *cfg = dev->config_info; + const struct adt7420_dev_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->int_name); if (drv_data->gpio == NULL) { diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c index 99289f02dde..ec3ab78a5a4 100644 --- a/drivers/sensor/adxl345/adxl345.c +++ b/drivers/sensor/adxl345/adxl345.c @@ -132,7 +132,7 @@ static int adxl345_init(struct device *dev) { int rc; struct adxl345_dev_data *data = dev->driver_data; - const struct adxl345_dev_config *cfg = dev->config_info; + const struct adxl345_dev_config *cfg = dev->config; uint8_t dev_id; data->sample_number = 0; diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c index bd5112906d0..7cec6cb316d 100644 --- a/drivers/sensor/adxl362/adxl362.c +++ b/drivers/sensor/adxl362/adxl362.c @@ -721,7 +721,7 @@ static int adxl362_chip_init(struct device *dev) */ static int adxl362_init(struct device *dev) { - const struct adxl362_config *config = dev->config_info; + const struct adxl362_config *config = dev->config; struct adxl362_data *data = dev->driver_data; uint8_t value; int err; diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c index d453066de2e..27c01c31f1f 100644 --- a/drivers/sensor/adxl362/adxl362_trigger.c +++ b/drivers/sensor/adxl362/adxl362_trigger.c @@ -123,7 +123,7 @@ int adxl362_trigger_set(struct device *dev, int adxl362_init_interrupt(struct device *dev) { struct adxl362_data *drv_data = dev->driver_data; - const struct adxl362_config *cfg = dev->config_info; + const struct adxl362_config *cfg = dev->config; int ret; k_mutex_init(&drv_data->trigger_mutex); diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c index d829aa44140..ba07f6f2324 100644 --- a/drivers/sensor/adxl372/adxl372.c +++ b/drivers/sensor/adxl372/adxl372.c @@ -58,7 +58,7 @@ static int adxl372_bus_access(struct device *dev, uint8_t reg, return spi_write(adxl372_data->bus, &adxl372_data->spi_cfg, &tx); #elif CONFIG_ADXL372_I2C - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; if (reg & ADXL372_READ) { return i2c_burst_read(adxl372_data->bus, cfg->i2c_addr, @@ -637,7 +637,7 @@ static int adxl372_attr_set_thresh(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; struct adxl372_activity_threshold threshold; int32_t value; int64_t micro_ms2 = val->val1 * 1000000LL + val->val2; @@ -692,7 +692,7 @@ static int adxl372_attr_set(struct device *dev, enum sensor_channel chan, static int adxl372_sample_fetch(struct device *dev, enum sensor_channel chan) { struct adxl372_data *data = dev->driver_data; - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; return adxl372_get_accel_data(dev, cfg->max_peak_detect_mode, &data->sample); @@ -750,7 +750,7 @@ static const struct sensor_driver_api adxl372_api_funcs = { static int adxl372_probe(struct device *dev) { - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; uint8_t dev_id, part_id; int ret; @@ -878,7 +878,7 @@ static int adxl372_probe(struct device *dev) static int adxl372_init(struct device *dev) { struct adxl372_data *data = dev->driver_data; - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; #ifdef CONFIG_ADXL372_I2C data->bus = device_get_binding(cfg->i2c_port); diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c index 780c7afb785..2052d8aa92f 100644 --- a/drivers/sensor/adxl372/adxl372_trigger.c +++ b/drivers/sensor/adxl372/adxl372_trigger.c @@ -20,7 +20,7 @@ static void adxl372_thread_cb(void *arg) { struct device *dev = arg; struct adxl372_data *drv_data = dev->driver_data; - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; uint8_t status1, status2; /* Clear the status */ @@ -56,7 +56,7 @@ static void adxl372_gpio_callback(struct device *dev, { struct adxl372_data *drv_data = CONTAINER_OF(cb, struct adxl372_data, gpio_cb); - const struct adxl372_dev_config *cfg = drv_data->dev->config_info; + const struct adxl372_dev_config *cfg = drv_data->dev->config; gpio_pin_interrupt_configure(drv_data->gpio, cfg->int_gpio, GPIO_INT_DISABLE); @@ -97,7 +97,7 @@ int adxl372_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct adxl372_data *drv_data = dev->driver_data; - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; uint8_t int_mask, int_en, status1, status2; int ret; @@ -141,7 +141,7 @@ out: int adxl372_init_interrupt(struct device *dev) { struct adxl372_data *drv_data = dev->driver_data; - const struct adxl372_dev_config *cfg = dev->config_info; + const struct adxl372_dev_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->gpio_port); if (drv_data->gpio == NULL) { diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c index 2e3b74511f9..957d05417e0 100644 --- a/drivers/sensor/amg88xx/amg88xx.c +++ b/drivers/sensor/amg88xx/amg88xx.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(AMG88XX, CONFIG_SENSOR_LOG_LEVEL); static int amg88xx_sample_fetch(struct device *dev, enum sensor_channel chan) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -66,7 +66,7 @@ static int amg88xx_channel_get(struct device *dev, static int amg88xx_init_device(struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; uint8_t tmp; if (i2c_reg_read_byte(drv_data->i2c, config->i2c_address, @@ -106,7 +106,7 @@ static int amg88xx_init_device(struct device *dev) int amg88xx_init(struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; drv_data->i2c = device_get_binding(config->i2c_name); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c index 62c1148f7c6..62afeeee98e 100644 --- a/drivers/sensor/amg88xx/amg88xx_trigger.c +++ b/drivers/sensor/amg88xx/amg88xx_trigger.c @@ -36,7 +36,7 @@ int amg88xx_attr_set(struct device *dev, const struct sensor_value *val) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; int16_t int_level = (val->val1 * 1000000 + val->val2) / AMG88XX_TREG_LSB_SCALING; uint8_t intl_reg; @@ -92,7 +92,7 @@ static void amg88xx_thread_cb(void *arg) { struct device *dev = arg; struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; uint8_t status; if (i2c_reg_read_byte(drv_data->i2c, config->i2c_address, @@ -140,7 +140,7 @@ int amg88xx_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; if (i2c_reg_write_byte(drv_data->i2c, config->i2c_address, AMG88XX_INTC, AMG88XX_INTC_DISABLED)) { @@ -170,7 +170,7 @@ int amg88xx_trigger_set(struct device *dev, int amg88xx_init_interrupt(struct device *dev) { struct amg88xx_data *drv_data = dev->driver_data; - const struct amg88xx_config *config = dev->config_info; + const struct amg88xx_config *config = dev->config; /* setup gpio interrupt */ drv_data->gpio = device_get_binding(config->gpio_name); diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index f8ff4cecb05..d86b9078550 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -47,7 +47,7 @@ static void apds9960_gpio_callback(struct device *dev, static int apds9960_sample_fetch(struct device *dev, enum sensor_channel chan) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; uint8_t tmp; @@ -151,7 +151,7 @@ static int apds9960_channel_get(struct device *dev, static int apds9960_proxy_setup(struct device *dev) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; if (i2c_reg_write_byte(data->i2c, config->i2c_address, @@ -223,7 +223,7 @@ static int apds9960_proxy_setup(struct device *dev) #ifdef CONFIG_APDS9960_ENABLE_ALS static int apds9960_ambient_setup(struct device *dev) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; uint16_t th; @@ -273,7 +273,7 @@ static int apds9960_ambient_setup(struct device *dev) static int apds9960_sensor_setup(struct device *dev) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; uint8_t chip_id; @@ -358,7 +358,7 @@ static int apds9960_sensor_setup(struct device *dev) static int apds9960_init_interrupt(struct device *dev) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *drv_data = dev->driver_data; /* setup gpio interrupt */ @@ -410,7 +410,7 @@ static int apds9960_init_interrupt(struct device *dev) static int apds9960_device_ctrl(struct device *dev, uint32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; int ret = 0; @@ -453,7 +453,7 @@ static int apds9960_device_ctrl(struct device *dev, uint32_t ctrl_command, static int apds9960_init(struct device *dev) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; /* Initialize time 5.7ms */ diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c index 0433690197e..92f475121b2 100644 --- a/drivers/sensor/apds9960/apds9960_trigger.c +++ b/drivers/sensor/apds9960/apds9960_trigger.c @@ -36,7 +36,7 @@ int apds9960_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; if (chan == SENSOR_CHAN_PROX) { @@ -69,7 +69,7 @@ int apds9960_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - const struct apds9960_config *config = dev->config_info; + const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->driver_data; apds9960_setup_int(data, false); diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index 72bf552321a..a3d3d3d73c5 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -53,7 +53,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, int state) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; switch (mode) { case BMC150_MAGN_POWER_MODE_SUSPEND: @@ -91,7 +91,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, static int bmc150_magn_set_odr(struct device *dev, uint8_t val) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t i; for (i = 0U; i < ARRAY_SIZE(bmc150_magn_samp_freq_table); ++i) { @@ -113,7 +113,7 @@ static int bmc150_magn_set_odr(struct device *dev, uint8_t val) static int bmc150_magn_read_rep_xy(struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -129,7 +129,7 @@ static int bmc150_magn_read_rep_xy(struct device *dev) static int bmc150_magn_read_rep_z(struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -175,7 +175,7 @@ static int bmc150_magn_compute_max_odr(struct device *dev, int rep_xy, static int bmc150_magn_read_odr(struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t i, odr_val, reg_val; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -200,7 +200,7 @@ static int bmc150_magn_read_odr(struct device *dev) static int bmc150_magn_write_rep_xy(struct device *dev, int val) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_REP_XY, @@ -219,7 +219,7 @@ static int bmc150_magn_write_rep_xy(struct device *dev, int val) static int bmc150_magn_write_rep_z(struct device *dev, int val) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, BMC150_MAGN_REG_REP_Z, @@ -292,7 +292,7 @@ static int bmc150_magn_sample_fetch(struct device *dev, enum sensor_channel chan) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint16_t values[BMC150_MAGN_AXIS_XYZR_MAX]; int16_t raw_x, raw_y, raw_z; uint16_t rhall; @@ -485,7 +485,7 @@ static const struct sensor_driver_api bmc150_magn_api_funcs = { static int bmc150_magn_init_chip(struct device *dev) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t chip_id; struct bmc150_magn_preset preset; @@ -571,7 +571,7 @@ err_poweroff: static int bmc150_magn_init(struct device *dev) { const struct bmc150_magn_config * const config = - dev->config_info; + dev->config; struct bmc150_magn_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c index 8c7c512095e..d4e6acc68da 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c @@ -20,7 +20,7 @@ static inline void setup_drdy(struct device *dev, { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config *const cfg = - dev->config_info; + dev->config; gpio_pin_interrupt_configure(data->gpio_drdy, cfg->gpio_drdy_int_pin, @@ -36,7 +36,7 @@ int bmc150_magn_trigger_set(struct device *dev, { struct bmc150_magn_data *data = dev->driver_data; const struct bmc150_magn_config * const config = - dev->config_info; + dev->config; uint8_t state; #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY) @@ -86,7 +86,7 @@ static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3) { struct device *dev = (struct device *) arg1; struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; while (1) { @@ -110,7 +110,7 @@ static void bmc150_magn_thread_main(void *arg1, void *arg2, void *arg3) static int bmc150_magn_set_drdy_polarity(struct device *dev, int state) { struct bmc150_magn_data *data = dev->driver_data; - const struct bmc150_magn_config *config = dev->config_info; + const struct bmc150_magn_config *config = dev->config; if (state) { state = 1; @@ -125,7 +125,7 @@ static int bmc150_magn_set_drdy_polarity(struct device *dev, int state) int bmc150_magn_init_interrupt(struct device *dev) { const struct bmc150_magn_config * const config = - dev->config_info; + dev->config; struct bmc150_magn_data *data = dev->driver_data; diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 1c44657134d..edf8fe4813e 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -117,7 +117,7 @@ static inline struct bme280_data *to_data(struct device *dev) static inline const struct bme280_config *to_config(struct device *dev) { - return dev->config_info; + return dev->config; } static inline struct device *to_bus(struct device *dev) diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c index 258f938aab3..8549fcbc84d 100644 --- a/drivers/sensor/bmg160/bmg160.c +++ b/drivers/sensor/bmg160/bmg160.c @@ -24,7 +24,7 @@ struct bmg160_device_data bmg160_data; static inline int bmg160_bus_config(struct device *dev) { - const struct bmg160_device_config *dev_cfg = dev->config_info; + const struct bmg160_device_config *dev_cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; uint32_t i2c_cfg; @@ -36,7 +36,7 @@ static inline int bmg160_bus_config(struct device *dev) int bmg160_read(struct device *dev, uint8_t reg_addr, uint8_t *data, uint8_t len) { - const struct bmg160_device_config *dev_cfg = dev->config_info; + const struct bmg160_device_config *dev_cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; int ret = 0; @@ -62,7 +62,7 @@ int bmg160_read_byte(struct device *dev, uint8_t reg_addr, uint8_t *byte) static int bmg160_write(struct device *dev, uint8_t reg_addr, uint8_t *data, uint8_t len) { - const struct bmg160_device_config *dev_cfg = dev->config_info; + const struct bmg160_device_config *dev_cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; int ret = 0; @@ -88,7 +88,7 @@ int bmg160_write_byte(struct device *dev, uint8_t reg_addr, uint8_t byte) int bmg160_update_byte(struct device *dev, uint8_t reg_addr, uint8_t mask, uint8_t value) { - const struct bmg160_device_config *dev_cfg = dev->config_info; + const struct bmg160_device_config *dev_cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; int ret = 0; @@ -273,7 +273,7 @@ static const struct sensor_driver_api bmg160_api = { int bmg160_init(struct device *dev) { - const struct bmg160_device_config *cfg = dev->config_info; + const struct bmg160_device_config *cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; uint8_t chip_id = 0U; uint16_t range_dps; diff --git a/drivers/sensor/bmg160/bmg160_trigger.c b/drivers/sensor/bmg160/bmg160_trigger.c index 744aafd8cae..f07117fc25e 100644 --- a/drivers/sensor/bmg160/bmg160_trigger.c +++ b/drivers/sensor/bmg160/bmg160_trigger.c @@ -23,7 +23,7 @@ static inline void setup_int(struct device *dev, { struct bmg160_device_data *data = dev->driver_data; const struct bmg160_device_config *const cfg = - dev->config_info; + dev->config; gpio_pin_interrupt_configure(data->gpio, cfg->int_pin, @@ -208,7 +208,7 @@ static void bmg160_work_cb(struct k_work *work) int bmg160_trigger_init(struct device *dev) { - const struct bmg160_device_config *cfg = dev->config_info; + const struct bmg160_device_config *cfg = dev->config; struct bmg160_device_data *bmg160 = dev->driver_data; /* set INT1 pin to: push-pull, active low */ diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index d237f398439..7906c6991b7 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -274,7 +274,7 @@ int bmi160_trigger_mode_init(struct device *dev) { struct bmi160_device_data *bmi160 = dev->driver_data; - const struct bmi160_device_config *cfg = dev->config_info; + const struct bmi160_device_config *cfg = dev->config; bmi160->gpio = device_get_binding((char *)cfg->gpio_port); if (!bmi160->gpio) { diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c index c38b282dfe1..df4bb720d05 100644 --- a/drivers/sensor/bmm150/bmm150.c +++ b/drivers/sensor/bmm150/bmm150.c @@ -41,7 +41,7 @@ static int bmm150_set_power_mode(struct device *dev, int state) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; switch (mode) { case BMM150_POWER_MODE_SUSPEND: @@ -80,7 +80,7 @@ static int bmm150_set_power_mode(struct device *dev, static int bmm150_set_odr(struct device *dev, uint8_t val) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint8_t i; for (i = 0U; i < ARRAY_SIZE(bmm150_samp_freq_table); ++i) { @@ -101,7 +101,7 @@ static int bmm150_set_odr(struct device *dev, uint8_t val) static int bmm150_read_rep_xy(struct device *dev) { struct bmm150_data *data = dev->driver->data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint8_t reg_val; if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr, @@ -117,7 +117,7 @@ static int bmm150_read_rep_xy(struct device *dev) static int bmm150_read_rep_z(struct device *dev) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint8_t reg_val; if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr, @@ -164,7 +164,7 @@ static int bmm150_compute_max_odr(struct device *dev, int rep_xy, static int bmm150_read_odr(struct device *dev) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint8_t i, odr_val, reg_val; if (i2c_reg_read_byte(data->i2c, config->i2c_slave_addr, @@ -189,7 +189,7 @@ static int bmm150_read_odr(struct device *dev) static int bmm150_write_rep_xy(struct device *dev, int val) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; if (i2c_reg_update_byte(data->i2c, config->i2c_slave_addr, BMM150_REG_REP_XY, @@ -208,7 +208,7 @@ static int bmm150_write_rep_xy(struct device *dev, int val) static int bmm150_write_rep_z(struct device *dev, int val) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; if (i2c_reg_update_byte(data->i2c, config->i2c_slave_addr, BMM150_REG_REP_Z, @@ -292,7 +292,7 @@ static int bmm150_sample_fetch(struct device *dev, enum sensor_channel chan) { struct bmm150_data *drv_data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint16_t values[BMM150_AXIS_XYZR_MAX]; int16_t raw_x, raw_y, raw_z; uint16_t rhall; @@ -489,7 +489,7 @@ static const struct sensor_driver_api bmm150_api_funcs = { static int bmm150_init_chip(struct device *dev) { struct bmm150_data *data = dev->driver_data; - const struct bmm150_config *config = dev->config_info; + const struct bmm150_config *config = dev->config; uint8_t chip_id; struct bmm150_preset preset; @@ -581,7 +581,7 @@ err_poweroff: static int bmm150_init(struct device *dev) { const struct bmm150_config *const config = - dev->config_info; + dev->config; struct bmm150_data *data = dev->driver_data; data->i2c = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c index 7b99e594e92..483368a26b2 100644 --- a/drivers/sensor/bq274xx/bq274xx.c +++ b/drivers/sensor/bq274xx/bq274xx.c @@ -351,7 +351,7 @@ static int bq274xx_sample_fetch(struct device *dev, enum sensor_channel chan) static int bq274xx_gauge_init(struct device *dev) { struct bq274xx_data *bq274xx = dev->driver_data; - const struct bq274xx_config *const config = dev->config_info; + const struct bq274xx_config *const config = dev->config; int status = 0; uint8_t tmp_checksum = 0, checksum_old = 0, checksum_new = 0; uint16_t flags = 0, designenergy_mwh = 0, taperrate = 0, id; diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c index 4e1b17043ca..faf81a0d67a 100644 --- a/drivers/sensor/dht/dht.c +++ b/drivers/sensor/dht/dht.c @@ -32,7 +32,7 @@ static int8_t dht_measure_signal_duration(struct device *dev, bool active) { struct dht_data *drv_data = dev->driver_data; - const struct dht_config *cfg = dev->config_info; + const struct dht_config *cfg = dev->config; uint32_t elapsed_cycles; uint32_t max_wait_cycles = (uint32_t)( (uint64_t)DHT_SIGNAL_MAX_WAIT_DURATION * @@ -60,7 +60,7 @@ static int8_t dht_measure_signal_duration(struct device *dev, static int dht_sample_fetch(struct device *dev, enum sensor_channel chan) { struct dht_data *drv_data = dev->driver_data; - const struct dht_config *cfg = dev->config_info; + const struct dht_config *cfg = dev->config; int ret = 0; int8_t signal_duration[DHT_DATA_BITS_NUM]; int8_t max_duration, min_duration, avg_duration; @@ -225,7 +225,7 @@ static int dht_init(struct device *dev) { int rc = 0; struct dht_data *drv_data = dev->driver_data; - const struct dht_config *cfg = dev->config_info; + const struct dht_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->ctrl); if (drv_data->gpio == NULL) { diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c index 4a587d0bede..8e18672826d 100644 --- a/drivers/sensor/dps310/dps310.c +++ b/drivers/sensor/dps310/dps310.c @@ -572,7 +572,7 @@ static bool dps310_measure_tmp(struct dps310_data *data, static int dps310_init(struct device *dev) { struct dps310_data *data = dev->driver_data; - const struct dps310_cfg *config = dev->config_info; + const struct dps310_cfg *config = dev->config; data->i2c_master = device_get_binding(config->i2c_bus_name); if (data->i2c_master == NULL) { @@ -664,7 +664,7 @@ static int dps310_init(struct device *dev) static int dps310_sample_fetch(struct device *dev, enum sensor_channel chan) { struct dps310_data *data = dev->driver_data; - const struct dps310_cfg *config = dev->config_info; + const struct dps310_cfg *config = dev->config; LOG_DBG("Fetching sample from DPS310"); diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c index ae095e7bc1e..74e370607b4 100644 --- a/drivers/sensor/fxas21002/fxas21002.c +++ b/drivers/sensor/fxas21002/fxas21002.c @@ -20,7 +20,7 @@ static const uint32_t sample_period[] = { static int fxas21002_sample_fetch(struct device *dev, enum sensor_channel chan) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; uint8_t buffer[FXAS21002_MAX_NUM_BYTES]; int16_t *raw; @@ -73,7 +73,7 @@ static void fxas21002_convert(struct sensor_value *val, int16_t raw, static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; int start_channel; int num_channels; @@ -132,7 +132,7 @@ static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, int fxas21002_get_power(struct device *dev, enum fxas21002_power *power) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; uint8_t val = *power; @@ -150,7 +150,7 @@ int fxas21002_get_power(struct device *dev, enum fxas21002_power *power) int fxas21002_set_power(struct device *dev, enum fxas21002_power power) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; return i2c_reg_update_byte(data->i2c, config->i2c_address, @@ -186,7 +186,7 @@ uint32_t fxas21002_get_transition_time(enum fxas21002_power start, static int fxas21002_init(struct device *dev) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; uint32_t transition_time; uint8_t whoami; diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c index 9e7ddaa81d5..ea2078c8b2c 100644 --- a/drivers/sensor/fxas21002/fxas21002_trigger.c +++ b/drivers/sensor/fxas21002/fxas21002_trigger.c @@ -50,7 +50,7 @@ static int fxas21002_handle_drdy_int(struct device *dev) static void fxas21002_handle_int(void *arg) { struct device *dev = (struct device *)arg; - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; uint8_t int_source; @@ -103,7 +103,7 @@ int fxas21002_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; enum fxas21002_power power = FXAS21002_POWER_STANDBY; uint32_t transition_time; @@ -171,7 +171,7 @@ exit: int fxas21002_trigger_init(struct device *dev) { - const struct fxas21002_config *config = dev->config_info; + const struct fxas21002_config *config = dev->config; struct fxas21002_data *data = dev->driver_data; uint8_t ctrl_reg2; diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index 40aebb63eb6..e7d2eea79c6 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -17,7 +17,7 @@ LOG_MODULE_REGISTER(FXOS8700, CONFIG_SENSOR_LOG_LEVEL); int fxos8700_set_odr(struct device *dev, const struct sensor_value *val) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; int32_t dr = val->val1; @@ -75,7 +75,7 @@ static int fxos8700_set_mt_ths(struct device *dev, const struct sensor_value *val) { #ifdef CONFIG_FXOS8700_MOTION - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; uint64_t micro_ms2 = abs(val->val1 * 1000000LL + val->val2); uint64_t ths = micro_ms2 / FXOS8700_FF_MT_THS_SCALE; @@ -117,7 +117,7 @@ static int fxos8700_attr_set(struct device *dev, static int fxos8700_sample_fetch(struct device *dev, enum sensor_channel chan) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; uint8_t buffer[FXOS8700_MAX_NUM_BYTES]; uint8_t num_bytes; @@ -234,7 +234,7 @@ static void fxos8700_temp_convert(struct sensor_value *val, int8_t raw) static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; int start_channel; int num_channels; @@ -341,7 +341,7 @@ static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, int fxos8700_get_power(struct device *dev, enum fxos8700_power *power) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; uint8_t val = *power; @@ -359,7 +359,7 @@ int fxos8700_get_power(struct device *dev, enum fxos8700_power *power) int fxos8700_set_power(struct device *dev, enum fxos8700_power power) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; return i2c_reg_update_byte(data->i2c, config->i2c_address, @@ -370,7 +370,7 @@ int fxos8700_set_power(struct device *dev, enum fxos8700_power power) static int fxos8700_init(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; struct sensor_value odr = {.val1 = 6, .val2 = 250000}; struct device *rst; diff --git a/drivers/sensor/fxos8700/fxos8700_trigger.c b/drivers/sensor/fxos8700/fxos8700_trigger.c index b8305f604f5..863cc591315 100644 --- a/drivers/sensor/fxos8700/fxos8700_trigger.c +++ b/drivers/sensor/fxos8700/fxos8700_trigger.c @@ -50,7 +50,7 @@ static int fxos8700_handle_drdy_int(struct device *dev) #ifdef CONFIG_FXOS8700_PULSE static int fxos8700_handle_pulse_int(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; sensor_trigger_handler_t handler = NULL; uint8_t pulse_source; @@ -88,7 +88,7 @@ static int fxos8700_handle_pulse_int(struct device *dev) #ifdef CONFIG_FXOS8700_MOTION static int fxos8700_handle_motion_int(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; sensor_trigger_handler_t handler = data->motion_handler; uint8_t motion_source; @@ -119,7 +119,7 @@ static int fxos8700_handle_motion_int(struct device *dev) static void fxos8700_handle_int(void *arg) { struct device *dev = (struct device *)arg; - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; uint8_t int_source; @@ -182,7 +182,7 @@ int fxos8700_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; enum fxos8700_power power = FXOS8700_POWER_STANDBY; uint8_t mask; @@ -260,7 +260,7 @@ exit: #ifdef CONFIG_FXOS8700_PULSE static int fxos8700_pulse_init(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; if (i2c_reg_write_byte(data->i2c, config->i2c_address, @@ -305,7 +305,7 @@ static int fxos8700_pulse_init(struct device *dev) #ifdef CONFIG_FXOS8700_MOTION static int fxos8700_motion_init(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; /* Set Mode 4, Motion detection with ELE = 1, OAE = 1 */ @@ -333,7 +333,7 @@ static int fxos8700_motion_init(struct device *dev) int fxos8700_trigger_init(struct device *dev) { - const struct fxos8700_config *config = dev->config_info; + const struct fxos8700_config *config = dev->config; struct fxos8700_data *data = dev->driver_data; uint8_t ctrl_reg5; diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c index 0fd5b12f9ed..84d4b36f727 100644 --- a/drivers/sensor/grove/light_sensor.c +++ b/drivers/sensor/grove/light_sensor.c @@ -84,7 +84,7 @@ static const struct sensor_driver_api gls_api = { static int gls_init(struct device *dev) { struct gls_data *drv_data = dev->driver_data; - const struct gls_config *cfg = dev->config_info; + const struct gls_config *cfg = dev->config; drv_data->adc = device_get_binding(cfg->adc_label); diff --git a/drivers/sensor/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c index 398f8378cb1..7a14ab4f8a7 100644 --- a/drivers/sensor/grove/temperature_sensor.c +++ b/drivers/sensor/grove/temperature_sensor.c @@ -59,7 +59,7 @@ static int gts_channel_get(struct device *dev, struct sensor_value *val) { struct gts_data *drv_data = dev->driver_data; - const struct gts_config *cfg = dev->config_info; + const struct gts_config *cfg = dev->config; double dval; /* @@ -87,7 +87,7 @@ static const struct sensor_driver_api gts_api = { static int gts_init(struct device *dev) { struct gts_data *drv_data = dev->driver_data; - const struct gts_config *cfg = dev->config_info; + const struct gts_config *cfg = dev->config; drv_data->adc = device_get_binding(cfg->adc_label); if (drv_data->adc == NULL) { diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c index ecc647d2710..439f279d41e 100644 --- a/drivers/sensor/hts221/hts221.c +++ b/drivers/sensor/hts221/hts221.c @@ -61,7 +61,7 @@ static int hts221_channel_get(struct device *dev, static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) { struct hts221_data *data = dev->driver_data; - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; uint8_t buf[4]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -82,7 +82,7 @@ static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) static int hts221_read_conversion_data(struct device *dev) { struct hts221_data *data = dev->driver_data; - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; uint8_t buf[16]; if (i2c_burst_read(data->i2c, cfg->i2c_addr, @@ -114,7 +114,7 @@ static const struct sensor_driver_api hts221_driver_api = { int hts221_init(struct device *dev) { - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; struct hts221_data *data = dev->driver_data; uint8_t id, idx; diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c index 1e050d04f20..87b7933a5fe 100644 --- a/drivers/sensor/hts221/hts221_trigger.c +++ b/drivers/sensor/hts221/hts221_trigger.c @@ -19,7 +19,7 @@ static inline void setup_drdy(struct device *dev, bool enable) { struct hts221_data *data = dev->driver_data; - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; unsigned int flags = enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE; @@ -58,7 +58,7 @@ int hts221_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct hts221_data *data = dev->driver_data; - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); @@ -122,7 +122,7 @@ static void hts221_work_cb(struct k_work *work) int hts221_init_interrupt(struct device *dev) { struct hts221_data *data = dev->driver_data; - const struct hts221_config *cfg = dev->config_info; + const struct hts221_config *cfg = dev->config; data->dev = dev; diff --git a/drivers/sensor/iis2dh/iis2dh.c b/drivers/sensor/iis2dh/iis2dh.c index 35c9910d516..2997f0c1fe1 100644 --- a/drivers/sensor/iis2dh/iis2dh.c +++ b/drivers/sensor/iis2dh/iis2dh.c @@ -92,7 +92,7 @@ static int iis2dh_set_range(struct device *dev, uint16_t range) static int iis2dh_set_odr(struct device *dev, uint16_t odr) { struct iis2dh_data *iis2dh = dev->driver_data; - const struct iis2dh_device_config *cfg = dev->config_info; + const struct iis2dh_device_config *cfg = dev->config; iis2dh_odr_t val; val = IIS2DH_ODR_TO_REG_HR(cfg->pm, odr); @@ -230,7 +230,7 @@ static const struct sensor_driver_api iis2dh_driver_api = { static int iis2dh_init_interface(struct device *dev) { struct iis2dh_data *iis2dh = dev->driver_data; - const struct iis2dh_device_config *cfg = dev->config_info; + const struct iis2dh_device_config *cfg = dev->config; iis2dh->bus = device_get_binding(cfg->bus_name); if (!iis2dh->bus) { @@ -252,7 +252,7 @@ static int iis2dh_init_interface(struct device *dev) static int iis2dh_init(struct device *dev) { struct iis2dh_data *iis2dh = dev->driver_data; - const struct iis2dh_device_config *cfg = dev->config_info; + const struct iis2dh_device_config *cfg = dev->config; uint8_t wai; if (iis2dh_init_interface(dev)) { diff --git a/drivers/sensor/iis2dh/iis2dh_trigger.c b/drivers/sensor/iis2dh/iis2dh_trigger.c index 810eb35dc1a..ad2684401c2 100644 --- a/drivers/sensor/iis2dh/iis2dh_trigger.c +++ b/drivers/sensor/iis2dh/iis2dh_trigger.c @@ -83,7 +83,7 @@ static void iis2dh_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; struct iis2dh_data *iis2dh = dev->driver_data; - const struct iis2dh_device_config *cfg = dev->config_info; + const struct iis2dh_device_config *cfg = dev->config; iis2dh_handle_drdy_int(dev); @@ -139,7 +139,7 @@ static void iis2dh_work_cb(struct k_work *work) int iis2dh_init_interrupt(struct device *dev) { struct iis2dh_data *iis2dh = dev->driver_data; - const struct iis2dh_device_config *cfg = dev->config_info; + const struct iis2dh_device_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c index a6a5153bab4..2e20017caf4 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc.c @@ -35,7 +35,7 @@ static int iis2dlpc_set_range(struct device *dev, uint16_t range) { int err; struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; uint8_t shift_gain = 0U; uint8_t fs = IIS2DLPC_FS_TO_REG(range); @@ -178,7 +178,7 @@ static int iis2dlpc_attr_set(struct device *dev, enum sensor_channel chan, static int iis2dlpc_sample_fetch(struct device *dev, enum sensor_channel chan) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; uint8_t shift; union axis3bit16_t buf; @@ -214,7 +214,7 @@ static const struct sensor_driver_api iis2dlpc_driver_api = { static int iis2dlpc_init_interface(struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; iis2dlpc->bus = device_get_binding(cfg->bus_name); if (!iis2dlpc->bus) { @@ -256,7 +256,7 @@ static int iis2dlpc_set_power_mode(struct iis2dlpc_data *iis2dlpc, static int iis2dlpc_init(struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; uint8_t wai; if (iis2dlpc_init_interface(dev)) { diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c index 728b6794092..95204350f00 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c @@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL); static int iis2dlpc_enable_int(struct device *dev, enum sensor_trigger_type type, int enable) { - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; struct iis2dlpc_data *iis2dlpc = dev->driver_data; iis2dlpc_reg_t int_route; @@ -165,7 +165,7 @@ static void iis2dlpc_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; iis2dlpc_all_sources_t sources; iis2dlpc_all_sources_get(iis2dlpc->ctx, &sources); @@ -234,7 +234,7 @@ static void iis2dlpc_work_cb(struct k_work *work) int iis2dlpc_init_interrupt(struct device *dev) { struct iis2dlpc_data *iis2dlpc = dev->driver_data; - const struct iis2dlpc_device_config *cfg = dev->config_info; + const struct iis2dlpc_device_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt (INT1 or INT2) */ diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c index d4b92402e98..62cc8002cb4 100644 --- a/drivers/sensor/iis2mdc/iis2mdc.c +++ b/drivers/sensor/iis2mdc/iis2mdc.c @@ -242,8 +242,7 @@ static const struct sensor_driver_api iis2mdc_driver_api = { static int iis2mdc_init_interface(struct device *dev) { - const struct iis2mdc_config *const config = - dev->config_info; + const struct iis2mdc_config *const config = dev->config; struct iis2mdc_data *iis2mdc = dev->driver_data; iis2mdc->bus = device_get_binding(config->master_dev_name); diff --git a/drivers/sensor/iis2mdc/iis2mdc_i2c.c b/drivers/sensor/iis2mdc/iis2mdc_i2c.c index fb99e2240c1..5c4c88174b2 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_i2c.c +++ b/drivers/sensor/iis2mdc/iis2mdc_i2c.c @@ -25,7 +25,7 @@ static int iis2mdc_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct iis2mdc_data *data = dev->driver_data; - const struct iis2mdc_config *cfg = dev->config_info; + const struct iis2mdc_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -35,7 +35,7 @@ static int iis2mdc_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct iis2mdc_data *data = dev->driver_data; - const struct iis2mdc_config *cfg = dev->config_info; + const struct iis2mdc_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/iis2mdc/iis2mdc_spi.c b/drivers/sensor/iis2mdc/iis2mdc_spi.c index f380b735e9b..ac4f8909140 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_spi.c +++ b/drivers/sensor/iis2mdc/iis2mdc_spi.c @@ -25,7 +25,7 @@ static int iis2mdc_spi_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct iis2mdc_data *data = dev->driver_data; - const struct iis2mdc_config *cfg = dev->config_info; + const struct iis2mdc_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | IIS2MDC_SPI_READ, 0 }; const struct spi_buf tx_buf = { @@ -67,7 +67,7 @@ static int iis2mdc_spi_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct iis2mdc_data *data = dev->driver_data; - const struct iis2mdc_config *cfg = dev->config_info; + const struct iis2mdc_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~IIS2MDC_SPI_READ }; const struct spi_buf tx_buf[2] = { @@ -108,7 +108,7 @@ int iis2mdc_spi_init(struct device *dev) data->ctx->handle = dev; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct iis2mdc_config *cfg = dev->config_info; + const struct iis2mdc_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/iis2mdc/iis2mdc_trigger.c b/drivers/sensor/iis2mdc/iis2mdc_trigger.c index e0e345a01e2..a4dd74e13fd 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_trigger.c +++ b/drivers/sensor/iis2mdc/iis2mdc_trigger.c @@ -54,8 +54,7 @@ static void iis2mdc_handle_interrupt(void *arg) { struct device *dev = arg; struct iis2mdc_data *iis2mdc = dev->driver_data; - const struct iis2mdc_config *const config = - dev->config_info; + const struct iis2mdc_config *const config = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -73,7 +72,7 @@ static void iis2mdc_gpio_callback(struct device *dev, { struct iis2mdc_data *iis2mdc = CONTAINER_OF(cb, struct iis2mdc_data, gpio_cb); - const struct iis2mdc_config *const config = iis2mdc->dev->config_info; + const struct iis2mdc_config *const config = iis2mdc->dev->config; ARG_UNUSED(pins); @@ -114,7 +113,7 @@ static void iis2mdc_work_cb(struct k_work *work) int iis2mdc_init_interrupt(struct device *dev) { struct iis2mdc_data *iis2mdc = dev->driver_data; - const struct iis2mdc_config *const config = dev->config_info; + const struct iis2mdc_config *const config = dev->config; /* setup data ready gpio interrupt */ iis2mdc->gpio = device_get_binding(config->drdy_port); diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c index 4a46c6a7e9d..3738a2357a9 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc.c @@ -191,7 +191,7 @@ static int iis3dhhc_init_chip(struct device *dev) static int iis3dhhc_init(struct device *dev) { - const struct iis3dhhc_config * const config = dev->config_info; + const struct iis3dhhc_config * const config = dev->config; struct iis3dhhc_data *data = dev->driver_data; data->bus = device_get_binding(config->master_dev_name); diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c index 5f16b333cae..958b591fe81 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c @@ -69,7 +69,7 @@ static void iis3dhhc_handle_interrupt(void *arg) struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; - const struct iis3dhhc_config *cfg = dev->config_info; + const struct iis3dhhc_config *cfg = dev->config; if (iis3dhhc->handler_drdy != NULL) { iis3dhhc->handler_drdy(dev, &drdy_trigger); @@ -84,7 +84,7 @@ static void iis3dhhc_gpio_callback(struct device *dev, { struct iis3dhhc_data *iis3dhhc = CONTAINER_OF(cb, struct iis3dhhc_data, gpio_cb); - const struct iis3dhhc_config *cfg = iis3dhhc->dev->config_info; + const struct iis3dhhc_config *cfg = iis3dhhc->dev->config; ARG_UNUSED(pins); @@ -126,7 +126,7 @@ static void iis3dhhc_work_cb(struct k_work *work) int iis3dhhc_init_interrupt(struct device *dev) { struct iis3dhhc_data *iis3dhhc = dev->driver_data; - const struct iis3dhhc_config *cfg = dev->config_info; + const struct iis3dhhc_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt (INT1 or INT2) */ diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c index dd86ed63c6c..9be5a8b7617 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx.c @@ -805,7 +805,7 @@ static const struct ism330dhcx_config ism330dhcx_config = { static int ism330dhcx_init(struct device *dev) { - const struct ism330dhcx_config * const config = dev->config_info; + const struct ism330dhcx_config * const config = dev->config; struct ism330dhcx_data *data = dev->driver_data; data->bus = device_get_binding(config->bus_name); diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c index 50afd4cb250..7f66ef6d4cf 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c @@ -24,7 +24,7 @@ static int ism330dhcx_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct ism330dhcx_data *data = dev->driver_data; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -34,7 +34,7 @@ static int ism330dhcx_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct ism330dhcx_data *data = dev->driver_data; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c index 91da9d3c211..e40f3661a41 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c @@ -24,7 +24,7 @@ static int ism330dhcx_spi_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct ism330dhcx_data *data = dev->driver_data; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | ISM330DHCX_SPI_READ, 0 }; const struct spi_buf tx_buf = { @@ -66,7 +66,7 @@ static int ism330dhcx_spi_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct ism330dhcx_data *data = dev->driver_data; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~ISM330DHCX_SPI_READ }; const struct spi_buf tx_buf[2] = { @@ -107,7 +107,7 @@ int ism330dhcx_spi_init(struct device *dev) data->ctx->handle = dev; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c index 86727b6144e..bf41e91b22f 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c @@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); */ static int ism330dhcx_enable_t_int(struct device *dev, int enable) { - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; struct ism330dhcx_data *ism330dhcx = dev->driver_data; ism330dhcx_pin_int2_route_t int2_route; @@ -53,7 +53,7 @@ static int ism330dhcx_enable_t_int(struct device *dev, int enable) */ static int ism330dhcx_enable_xl_int(struct device *dev, int enable) { - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; struct ism330dhcx_data *ism330dhcx = dev->driver_data; if (enable) { @@ -89,7 +89,7 @@ static int ism330dhcx_enable_xl_int(struct device *dev, int enable) */ static int ism330dhcx_enable_g_int(struct device *dev, int enable) { - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; struct ism330dhcx_data *ism330dhcx = dev->driver_data; if (enable) { @@ -168,7 +168,7 @@ static void ism330dhcx_handle_interrupt(void *arg) struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; ism330dhcx_status_reg_t status; while (1) { @@ -209,7 +209,7 @@ static void ism330dhcx_gpio_callback(struct device *dev, { struct ism330dhcx_data *ism330dhcx = CONTAINER_OF(cb, struct ism330dhcx_data, gpio_cb); - const struct ism330dhcx_config *cfg = ism330dhcx->dev->config_info; + const struct ism330dhcx_config *cfg = ism330dhcx->dev->config; ARG_UNUSED(pins); @@ -251,7 +251,7 @@ static void ism330dhcx_work_cb(struct k_work *work) int ism330dhcx_init_interrupt(struct device *dev) { struct ism330dhcx_data *ism330dhcx = dev->driver_data; - const struct ism330dhcx_config *cfg = dev->config_info; + const struct ism330dhcx_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt (INT1 or INT2) */ diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c index b079de167d1..d058370631f 100644 --- a/drivers/sensor/lis2dh/lis2dh.c +++ b/drivers/sensor/lis2dh/lis2dh.c @@ -269,7 +269,7 @@ static const struct sensor_driver_api lis2dh_driver_api = { int lis2dh_init(struct device *dev) { struct lis2dh_data *lis2dh = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; int status; uint8_t id; uint8_t raw[6]; diff --git a/drivers/sensor/lis2dh/lis2dh_i2c.c b/drivers/sensor/lis2dh/lis2dh_i2c.c index efcaed4a741..b69e09866b0 100644 --- a/drivers/sensor/lis2dh/lis2dh_i2c.c +++ b/drivers/sensor/lis2dh/lis2dh_i2c.c @@ -24,7 +24,7 @@ static int lis2dh_i2c_read_data(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr | LIS2DH_AUTOINCREMENT_ADDR, @@ -35,7 +35,7 @@ static int lis2dh_i2c_write_data(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr | LIS2DH_AUTOINCREMENT_ADDR, @@ -46,7 +46,7 @@ static int lis2dh_i2c_read_reg(struct device *dev, uint8_t reg_addr, uint8_t *value) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; return i2c_reg_read_byte(data->bus, cfg->i2c_slv_addr, @@ -57,7 +57,7 @@ static int lis2dh_i2c_write_reg(struct device *dev, uint8_t reg_addr, uint8_t value) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; return i2c_reg_write_byte(data->bus, cfg->i2c_slv_addr, @@ -68,7 +68,7 @@ static int lis2dh_i2c_update_reg(struct device *dev, uint8_t reg_addr, uint8_t mask, uint8_t value) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; return i2c_reg_update_byte(data->bus, cfg->i2c_slv_addr, diff --git a/drivers/sensor/lis2dh/lis2dh_spi.c b/drivers/sensor/lis2dh/lis2dh_spi.c index 46fa37f465b..9336b645637 100644 --- a/drivers/sensor/lis2dh/lis2dh_spi.c +++ b/drivers/sensor/lis2dh/lis2dh_spi.c @@ -22,7 +22,7 @@ static int lis2dh_raw_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | LIS2DH_SPI_READ_BIT, 0 }; const struct spi_buf tx_buf = { @@ -68,7 +68,7 @@ static int lis2dh_raw_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2dh_data *data = dev->driver_data; - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~LIS2DH_SPI_READ_BIT }; const struct spi_buf tx_buf[2] = { @@ -154,7 +154,7 @@ int lis2dh_spi_init(struct device *dev) data->hw_tf = &lis2dh_spi_transfer_fn; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct lis2dh_config *cfg = dev->config_info; + const struct lis2dh_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c index b1a7cd110f2..2d4b657681e 100644 --- a/drivers/sensor/lis2ds12/lis2ds12.c +++ b/drivers/sensor/lis2ds12/lis2ds12.c @@ -256,7 +256,7 @@ static const struct sensor_driver_api lis2ds12_api_funcs = { static int lis2ds12_init(struct device *dev) { - const struct lis2ds12_config * const config = dev->config_info; + const struct lis2ds12_config * const config = dev->config; struct lis2ds12_data *data = dev->driver_data; uint8_t chip_id; diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c index b5e6f1f00ef..523dc3c4392 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c +++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c @@ -24,7 +24,7 @@ static void lis2ds12_gpio_callback(struct device *dev, { struct lis2ds12_data *data = CONTAINER_OF(cb, struct lis2ds12_data, gpio_cb); - const struct lis2ds12_config *cfg = data->dev->config_info; + const struct lis2ds12_config *cfg = data->dev->config; ARG_UNUSED(pins); @@ -51,7 +51,7 @@ static void lis2ds12_handle_int(void *arg) { struct device *dev = arg; struct lis2ds12_data *data = dev->driver_data; - const struct lis2ds12_config *cfg = dev->config_info; + const struct lis2ds12_config *cfg = dev->config; uint8_t status; if (data->hw_tf->read_reg(data, LIS2DS12_REG_STATUS, &status) < 0) { @@ -120,7 +120,7 @@ static int lis2ds12_init_interrupt(struct device *dev) int lis2ds12_trigger_init(struct device *dev) { struct lis2ds12_data *data = dev->driver_data; - const struct lis2ds12_config *cfg = dev->config_info; + const struct lis2ds12_config *cfg = dev->config; /* setup data ready gpio interrupt */ data->gpio = device_get_binding(cfg->irq_port); @@ -165,7 +165,7 @@ int lis2ds12_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct lis2ds12_data *data = dev->driver_data; - const struct lis2ds12_config *cfg = dev->config_info; + const struct lis2ds12_config *cfg = dev->config; uint8_t buf[6]; __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c index 37b35469493..f67b44b05cc 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.c +++ b/drivers/sensor/lis2dw12/lis2dw12.c @@ -35,7 +35,7 @@ static int lis2dw12_set_range(struct device *dev, uint16_t range) { int err; struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; uint8_t shift_gain = 0U; uint8_t fs = LIS2DW12_FS_TO_REG(range); @@ -178,7 +178,7 @@ static int lis2dw12_attr_set(struct device *dev, enum sensor_channel chan, static int lis2dw12_sample_fetch(struct device *dev, enum sensor_channel chan) { struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; uint8_t shift; union axis3bit16_t buf; @@ -214,7 +214,7 @@ static const struct sensor_driver_api lis2dw12_driver_api = { static int lis2dw12_init_interface(struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; lis2dw12->bus = device_get_binding(cfg->bus_name); if (!lis2dw12->bus) { @@ -256,7 +256,7 @@ static int lis2dw12_set_power_mode(struct lis2dw12_data *lis2dw12, static int lis2dw12_init(struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; uint8_t wai; if (lis2dw12_init_interface(dev)) { diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c index 9c3798430b4..5242d9139f1 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c +++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c @@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL); static int lis2dw12_enable_int(struct device *dev, enum sensor_trigger_type type, int enable) { - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; struct lis2dw12_data *lis2dw12 = dev->driver_data; lis2dw12_reg_t int_route; @@ -168,7 +168,7 @@ static void lis2dw12_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; lis2dw12_all_sources_t sources; lis2dw12_all_sources_get(lis2dw12->ctx, &sources); @@ -237,7 +237,7 @@ static void lis2dw12_work_cb(struct k_work *work) int lis2dw12_init_interrupt(struct device *dev) { struct lis2dw12_data *lis2dw12 = dev->driver_data; - const struct lis2dw12_device_config *cfg = dev->config_info; + const struct lis2dw12_device_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt (INT1 or INT2) */ diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 01756c35d50..3edfc3fcfba 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -242,8 +242,7 @@ static const struct sensor_driver_api lis2mdl_driver_api = { static int lis2mdl_init_interface(struct device *dev) { - const struct lis2mdl_config *const config = - dev->config_info; + const struct lis2mdl_config *const config = dev->config; struct lis2mdl_data *lis2mdl = dev->driver_data; lis2mdl->bus = device_get_binding(config->master_dev_name); diff --git a/drivers/sensor/lis2mdl/lis2mdl_i2c.c b/drivers/sensor/lis2mdl/lis2mdl_i2c.c index 2353e584890..759ad3d26e5 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_i2c.c +++ b/drivers/sensor/lis2mdl/lis2mdl_i2c.c @@ -25,7 +25,7 @@ static int lis2mdl_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct lis2mdl_data *data = dev->driver_data; - const struct lis2mdl_config *cfg = dev->config_info; + const struct lis2mdl_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -35,7 +35,7 @@ static int lis2mdl_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct lis2mdl_data *data = dev->driver_data; - const struct lis2mdl_config *cfg = dev->config_info; + const struct lis2mdl_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/lis2mdl/lis2mdl_spi.c b/drivers/sensor/lis2mdl/lis2mdl_spi.c index 3331f074360..d3afdb49e48 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_spi.c +++ b/drivers/sensor/lis2mdl/lis2mdl_spi.c @@ -25,7 +25,7 @@ static int lis2mdl_spi_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2mdl_data *data = dev->driver_data; - const struct lis2mdl_config *cfg = dev->config_info; + const struct lis2mdl_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | LIS2MDL_SPI_READ, 0 }; const struct spi_buf tx_buf = { @@ -67,7 +67,7 @@ static int lis2mdl_spi_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lis2mdl_data *data = dev->driver_data; - const struct lis2mdl_config *cfg = dev->config_info; + const struct lis2mdl_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~LIS2MDL_SPI_READ }; const struct spi_buf tx_buf[2] = { @@ -108,7 +108,7 @@ int lis2mdl_spi_init(struct device *dev) data->ctx->handle = dev; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct lis2mdl_config *cfg = dev->config_info; + const struct lis2mdl_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c index 12dfcdb1e93..cde16f16e6c 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c +++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c @@ -54,8 +54,7 @@ static void lis2mdl_handle_interrupt(void *arg) { struct device *dev = arg; struct lis2mdl_data *lis2mdl = dev->driver_data; - const struct lis2mdl_config *const config = - dev->config_info; + const struct lis2mdl_config *const config = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -73,7 +72,7 @@ static void lis2mdl_gpio_callback(struct device *dev, { struct lis2mdl_data *lis2mdl = CONTAINER_OF(cb, struct lis2mdl_data, gpio_cb); - const struct lis2mdl_config *const config = lis2mdl->dev->config_info; + const struct lis2mdl_config *const config = lis2mdl->dev->config; ARG_UNUSED(pins); @@ -114,7 +113,7 @@ static void lis2mdl_work_cb(struct k_work *work) int lis2mdl_init_interrupt(struct device *dev) { struct lis2mdl_data *lis2mdl = dev->driver_data; - const struct lis2mdl_config *const config = dev->config_info; + const struct lis2mdl_config *const config = dev->config; /* setup data ready gpio interrupt */ lis2mdl->gpio = device_get_binding(config->gpio_name); diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c index 189856611eb..e383894843f 100644 --- a/drivers/sensor/lps22hb/lps22hb.c +++ b/drivers/sensor/lps22hb/lps22hb.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LPS22HB, CONFIG_SENSOR_LOG_LEVEL); static inline int lps22hb_set_odr_raw(struct device *dev, uint8_t odr) { struct lps22hb_data *data = dev->driver_data; - const struct lps22hb_config *config = dev->config_info; + const struct lps22hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LPS22HB_REG_CTRL_REG1, @@ -35,7 +35,7 @@ static int lps22hb_sample_fetch(struct device *dev, enum sensor_channel chan) { struct lps22hb_data *data = dev->driver_data; - const struct lps22hb_config *config = dev->config_info; + const struct lps22hb_config *config = dev->config; uint8_t out[5]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -98,7 +98,7 @@ static const struct sensor_driver_api lps22hb_api_funcs = { static int lps22hb_init_chip(struct device *dev) { struct lps22hb_data *data = dev->driver_data; - const struct lps22hb_config *config = dev->config_info; + const struct lps22hb_config *config = dev->config; uint8_t chip_id; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -133,7 +133,7 @@ err_poweroff: static int lps22hb_init(struct device *dev) { - const struct lps22hb_config * const config = dev->config_info; + const struct lps22hb_config * const config = dev->config; struct lps22hb_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/lps22hh/lps22hh.c b/drivers/sensor/lps22hh/lps22hh.c index d48b23d7965..ebf713531ec 100644 --- a/drivers/sensor/lps22hh/lps22hh.c +++ b/drivers/sensor/lps22hh/lps22hh.c @@ -172,7 +172,7 @@ static int lps22hh_init_chip(struct device *dev) static int lps22hh_init(struct device *dev) { - const struct lps22hh_config * const config = dev->config_info; + const struct lps22hh_config * const config = dev->config; struct lps22hh_data *data = dev->driver_data; data->bus = device_get_binding(config->master_dev_name); diff --git a/drivers/sensor/lps22hh/lps22hh_i2c.c b/drivers/sensor/lps22hh/lps22hh_i2c.c index ef9104673b6..9126787bb70 100644 --- a/drivers/sensor/lps22hh/lps22hh_i2c.c +++ b/drivers/sensor/lps22hh/lps22hh_i2c.c @@ -24,7 +24,7 @@ static int lps22hh_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct lps22hh_data *data = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -34,7 +34,7 @@ static int lps22hh_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct lps22hh_data *data = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/lps22hh/lps22hh_spi.c b/drivers/sensor/lps22hh/lps22hh_spi.c index c01d7b187d0..25e7a706709 100644 --- a/drivers/sensor/lps22hh/lps22hh_spi.c +++ b/drivers/sensor/lps22hh/lps22hh_spi.c @@ -25,7 +25,7 @@ static int lps22hh_spi_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lps22hh_data *data = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | LPS22HH_SPI_READ, 0 }; const struct spi_buf tx_buf = { @@ -67,7 +67,7 @@ static int lps22hh_spi_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lps22hh_data *data = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~LPS22HH_SPI_READ }; const struct spi_buf tx_buf[2] = { @@ -108,7 +108,7 @@ int lps22hh_spi_init(struct device *dev) data->ctx->handle = dev; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c index 32283b3fa03..417a420b4cb 100644 --- a/drivers/sensor/lps22hh/lps22hh_trigger.c +++ b/drivers/sensor/lps22hh/lps22hh_trigger.c @@ -71,7 +71,7 @@ static void lps22hh_handle_interrupt(void *arg) { struct device *dev = arg; struct lps22hh_data *lps22hh = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -91,7 +91,7 @@ static void lps22hh_gpio_callback(struct device *dev, CONTAINER_OF(cb, struct lps22hh_data, gpio_cb); ARG_UNUSED(pins); - const struct lps22hh_config *cfg = lps22hh->dev->config_info; + const struct lps22hh_config *cfg = lps22hh->dev->config; gpio_pin_interrupt_configure(lps22hh->gpio, cfg->drdy_pin, GPIO_INT_DISABLE); @@ -131,7 +131,7 @@ static void lps22hh_work_cb(struct k_work *work) int lps22hh_init_interrupt(struct device *dev) { struct lps22hh_data *lps22hh = dev->driver_data; - const struct lps22hh_config *cfg = dev->config_info; + const struct lps22hh_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index fe8a03af2eb..27b27a2ee83 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(LPS25HB, CONFIG_SENSOR_LOG_LEVEL); static inline int lps25hb_power_ctrl(struct device *dev, uint8_t value) { struct lps25hb_data *data = dev->driver_data; - const struct lps25hb_config *config = dev->config_info; + const struct lps25hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_CTRL_REG1, @@ -34,7 +34,7 @@ static inline int lps25hb_power_ctrl(struct device *dev, uint8_t value) static inline int lps25hb_set_odr_raw(struct device *dev, uint8_t odr) { struct lps25hb_data *data = dev->driver_data; - const struct lps25hb_config *config = dev->config_info; + const struct lps25hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LPS25HB_REG_CTRL_REG1, @@ -46,7 +46,7 @@ static int lps25hb_sample_fetch(struct device *dev, enum sensor_channel chan) { struct lps25hb_data *data = dev->driver_data; - const struct lps25hb_config *config = dev->config_info; + const struct lps25hb_config *config = dev->config; uint8_t out[5]; int offset; @@ -114,7 +114,7 @@ static const struct sensor_driver_api lps25hb_api_funcs = { static int lps25hb_init_chip(struct device *dev) { struct lps25hb_data *data = dev->driver_data; - const struct lps25hb_config *config = dev->config_info; + const struct lps25hb_config *config = dev->config; uint8_t chip_id; lps25hb_power_ctrl(dev, 0); @@ -162,7 +162,7 @@ err_poweroff: static int lps25hb_init(struct device *dev) { - const struct lps25hb_config * const config = dev->config_info; + const struct lps25hb_config * const config = dev->config; struct lps25hb_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c index e9afb8138c6..6364a1cf4a9 100644 --- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c +++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(lsm303dlhc_magn, CONFIG_SENSOR_LOG_LEVEL); static int lsm303dlhc_sample_fetch(struct device *dev, enum sensor_channel chan) { - const struct lsm303dlhc_magn_config *config = dev->config_info; + const struct lsm303dlhc_magn_config *config = dev->config; struct lsm303dlhc_magn_data *drv_data = dev->driver_data; uint8_t magn_buf[6]; uint8_t status; @@ -93,7 +93,7 @@ static const struct sensor_driver_api lsm303dlhc_magn_driver_api = { static int lsm303dlhc_magn_init(struct device *dev) { - const struct lsm303dlhc_magn_config *config = dev->config_info; + const struct lsm303dlhc_magn_config *config = dev->config; struct lsm303dlhc_magn_data *drv_data = dev->driver_data; drv_data->i2c = device_get_binding(config->i2c_name); diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index f6924b9a8f3..a0b463273c9 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(LSM6DS0, CONFIG_SENSOR_LOG_LEVEL); static inline int lsm6ds0_reboot(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_CTRL_REG8, @@ -43,7 +43,7 @@ static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en, int y_en, int z_en) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG5_XL_XEN_XL) | (y_en << LSM6DS0_SHIFT_CTRL_REG5_XL_YEN_XL) | (z_en << LSM6DS0_SHIFT_CTRL_REG5_XL_ZEN_XL); @@ -59,7 +59,7 @@ static inline int lsm6ds0_accel_axis_ctrl(struct device *dev, int x_en, static int lsm6ds0_accel_set_fs_raw(struct device *dev, uint8_t fs) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_CTRL_REG6_XL, @@ -74,7 +74,7 @@ static int lsm6ds0_accel_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6ds0_accel_set_odr_raw(struct device *dev, uint8_t odr) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_CTRL_REG6_XL, @@ -90,7 +90,7 @@ static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en, int z_en) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t state = (x_en << LSM6DS0_SHIFT_CTRL_REG4_XEN_G) | (y_en << LSM6DS0_SHIFT_CTRL_REG4_YEN_G) | (z_en << LSM6DS0_SHIFT_CTRL_REG4_ZEN_G); @@ -106,7 +106,7 @@ static inline int lsm6ds0_gyro_axis_ctrl(struct device *dev, int x_en, int y_en, static int lsm6ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_CTRL_REG1_G, @@ -121,7 +121,7 @@ static int lsm6ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM6DS0_REG_CTRL_REG1_G, @@ -136,7 +136,7 @@ static int lsm6ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr) static int lsm6ds0_sample_fetch_accel(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t buf[6]; if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, @@ -164,7 +164,7 @@ static int lsm6ds0_sample_fetch_accel(struct device *dev) static int lsm6ds0_sample_fetch_gyro(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t buf[6]; if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, @@ -193,7 +193,7 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev) static int lsm6ds0_sample_fetch_temp(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t buf[2]; if (i2c_burst_read(data->i2c_master, config->i2c_slave_addr, @@ -407,7 +407,7 @@ static const struct sensor_driver_api lsm6ds0_api_funcs = { static int lsm6ds0_init_chip(struct device *dev) { struct lsm6ds0_data *data = dev->driver_data; - const struct lsm6ds0_config *config = dev->config_info; + const struct lsm6ds0_config *config = dev->config; uint8_t chip_id; if (lsm6ds0_reboot(dev) < 0) { @@ -482,7 +482,7 @@ static int lsm6ds0_init_chip(struct device *dev) static int lsm6ds0_init(struct device *dev) { - const struct lsm6ds0_config * const config = dev->config_info; + const struct lsm6ds0_config * const config = dev->config; struct lsm6ds0_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index f3b2b817187..fc3c01318a8 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -779,7 +779,7 @@ static struct lsm6dsl_config lsm6dsl_config = { static int lsm6dsl_init(struct device *dev) { - const struct lsm6dsl_config * const config = dev->config_info; + const struct lsm6dsl_config * const config = dev->config; struct lsm6dsl_data *data = dev->driver_data; data->comm_master = device_get_binding(config->comm_master_dev_name); diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c index 62ad2948af3..cf8df1d0e9c 100644 --- a/drivers/sensor/lsm6dso/lsm6dso.c +++ b/drivers/sensor/lsm6dso/lsm6dso.c @@ -789,7 +789,7 @@ static const struct lsm6dso_config lsm6dso_config = { static int lsm6dso_init(struct device *dev) { - const struct lsm6dso_config * const config = dev->config_info; + const struct lsm6dso_config * const config = dev->config; struct lsm6dso_data *data = dev->driver_data; data->bus = device_get_binding(config->bus_name); diff --git a/drivers/sensor/lsm6dso/lsm6dso_i2c.c b/drivers/sensor/lsm6dso/lsm6dso_i2c.c index 3807b71da40..f9de5e56944 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_i2c.c +++ b/drivers/sensor/lsm6dso/lsm6dso_i2c.c @@ -24,7 +24,7 @@ static int lsm6dso_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lsm6dso_data *data = dev->driver_data; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -34,7 +34,7 @@ static int lsm6dso_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lsm6dso_data *data = dev->driver_data; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/lsm6dso/lsm6dso_spi.c b/drivers/sensor/lsm6dso/lsm6dso_spi.c index 3c8dafccb2c..e12afce349b 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_spi.c +++ b/drivers/sensor/lsm6dso/lsm6dso_spi.c @@ -24,7 +24,7 @@ static int lsm6dso_spi_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lsm6dso_data *data = dev->driver_data; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 }; const struct spi_buf tx_buf = { @@ -66,7 +66,7 @@ static int lsm6dso_spi_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint8_t len) { struct lsm6dso_data *data = dev->driver_data; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; const struct spi_config *spi_cfg = &cfg->spi_conf; uint8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ }; const struct spi_buf tx_buf[2] = { @@ -107,7 +107,7 @@ int lsm6dso_spi_init(struct device *dev) data->ctx->handle = dev; #if DT_INST_SPI_DEV_HAS_CS_GPIOS(0) - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c index 220b158dab4..c9129e0008a 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c +++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c @@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); */ static int lsm6dso_enable_t_int(struct device *dev, int enable) { - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; struct lsm6dso_data *lsm6dso = dev->driver_data; lsm6dso_pin_int2_route_t int2_route; @@ -53,7 +53,7 @@ static int lsm6dso_enable_t_int(struct device *dev, int enable) */ static int lsm6dso_enable_xl_int(struct device *dev, int enable) { - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; struct lsm6dso_data *lsm6dso = dev->driver_data; if (enable) { @@ -89,7 +89,7 @@ static int lsm6dso_enable_xl_int(struct device *dev, int enable) */ static int lsm6dso_enable_g_int(struct device *dev, int enable) { - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; struct lsm6dso_data *lsm6dso = dev->driver_data; if (enable) { @@ -168,7 +168,7 @@ static void lsm6dso_handle_interrupt(void *arg) struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; lsm6dso_status_reg_t status; while (1) { @@ -209,7 +209,7 @@ static void lsm6dso_gpio_callback(struct device *dev, { struct lsm6dso_data *lsm6dso = CONTAINER_OF(cb, struct lsm6dso_data, gpio_cb); - const struct lsm6dso_config *cfg = lsm6dso->dev->config_info; + const struct lsm6dso_config *cfg = lsm6dso->dev->config; ARG_UNUSED(pins); @@ -251,7 +251,7 @@ static void lsm6dso_work_cb(struct k_work *work) int lsm6dso_init_interrupt(struct device *dev) { struct lsm6dso_data *lsm6dso = dev->driver_data; - const struct lsm6dso_config *cfg = dev->config_info; + const struct lsm6dso_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt (INT1 or INT2) */ diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c index 7a39c96349b..5ac01ff273a 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c @@ -26,7 +26,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power, int x_en, int y_en, int z_en) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *config = dev->config_info; + const struct lsm9ds0_gyro_config *config = dev->config; uint8_t state = (power << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_PD) | (x_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_XEN) | (y_en << LSM9DS0_GYRO_SHIFT_CTRL_REG1_G_YEN) | @@ -44,7 +44,7 @@ static inline int lsm9ds0_gyro_power_ctrl(struct device *dev, int power, static int lsm9ds0_gyro_set_fs_raw(struct device *dev, uint8_t fs) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *config = dev->config_info; + const struct lsm9ds0_gyro_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_GYRO_REG_CTRL_REG4_G, @@ -85,7 +85,7 @@ static int lsm9ds0_gyro_set_fs(struct device *dev, int fs) static inline int lsm9ds0_gyro_set_odr_raw(struct device *dev, uint8_t odr) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *config = dev->config_info; + const struct lsm9ds0_gyro_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_GYRO_REG_CTRL_REG1_G, @@ -122,7 +122,7 @@ static int lsm9ds0_gyro_sample_fetch(struct device *dev, enum sensor_channel chan) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *config = dev->config_info; + const struct lsm9ds0_gyro_config *config = dev->config; uint8_t x_l, x_h, y_l, y_h, z_l, z_h; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || @@ -262,7 +262,7 @@ static const struct sensor_driver_api lsm9ds0_gyro_api_funcs = { static int lsm9ds0_gyro_init_chip(struct device *dev) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *config = dev->config_info; + const struct lsm9ds0_gyro_config *config = dev->config; uint8_t chip_id; if (lsm9ds0_gyro_power_ctrl(dev, 0, 0, 0, 0) < 0) { @@ -317,8 +317,7 @@ err_poweroff: static int lsm9ds0_gyro_init(struct device *dev) { - const struct lsm9ds0_gyro_config * const config = - dev->config_info; + const struct lsm9ds0_gyro_config * const config = dev->config; struct lsm9ds0_gyro_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c index f5b2aee00a6..a31ccf7d5f3 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c @@ -24,7 +24,7 @@ static inline void setup_drdy(struct device *dev, bool enable) { struct lsm9ds0_gyro_data *data = dev->driver_data; - const struct lsm9ds0_gyro_config *cfg = dev->config_info; + const struct lsm9ds0_gyro_config *cfg = dev->config; gpio_pin_interrupt_configure(data->gpio_drdy, cfg->gpio_drdy_int_pin, @@ -39,7 +39,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev, { struct lsm9ds0_gyro_data *data = dev->driver_data; const struct lsm9ds0_gyro_config * const config = - dev->config_info; + dev->config; uint8_t state; if (trig->type == SENSOR_TRIG_DATA_READY) { @@ -100,7 +100,7 @@ static void lsm9ds0_gyro_thread_main(void *arg1, void *arg2, void *arg3) int lsm9ds0_gyro_init_interrupt(struct device *dev) { const struct lsm9ds0_gyro_config * const config = - dev->config_info; + dev->config; struct lsm9ds0_gyro_data *data = dev->driver_data; k_sem_init(&data->sem, 0, UINT_MAX); diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index 2fea36fed83..b2b09850fcc 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LSM9DS0_MFD, CONFIG_SENSOR_LOG_LEVEL); static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_CTRL_REG0_XM, @@ -45,7 +45,7 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) static inline int lsm9ds0_mfd_accel_set_odr_raw(struct device *dev, uint8_t odr) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_CTRL_REG1_XM, @@ -89,7 +89,7 @@ static int lsm9ds0_mfd_accel_set_odr(struct device *dev, static inline int lsm9ds0_mfd_accel_set_fs_raw(struct device *dev, uint8_t fs) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_CTRL_REG2_XM, @@ -134,7 +134,7 @@ static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val) static inline int lsm9ds0_mfd_magn_set_odr_raw(struct device *dev, uint8_t odr) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_CTRL_REG5_XM, @@ -174,7 +174,7 @@ static int lsm9ds0_mfd_magn_set_odr(struct device *dev, static inline int lsm9ds0_mfd_magn_set_fs_raw(struct device *dev, uint8_t fs) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, LSM9DS0_MFD_REG_CTRL_REG6_XM, @@ -219,7 +219,7 @@ static int lsm9ds0_mfd_magn_set_fs(struct device *dev, static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; #if defined(CONFIG_LSM9DS0_MFD_ACCEL_ENABLE_X) @@ -273,7 +273,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -321,7 +321,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; if (i2c_reg_read_byte(data->i2c_master, config->i2c_slave_addr, @@ -668,7 +668,7 @@ static const struct sensor_driver_api lsm9ds0_mfd_api_funcs = { static int lsm9ds0_mfd_init_chip(struct device *dev) { struct lsm9ds0_mfd_data *data = dev->driver_data; - const struct lsm9ds0_mfd_config *config = dev->config_info; + const struct lsm9ds0_mfd_config *config = dev->config; uint8_t chip_id; if (lsm9ds0_mfd_reboot_memory(dev) < 0) { @@ -769,8 +769,7 @@ static int lsm9ds0_mfd_init_chip(struct device *dev) int lsm9ds0_mfd_init(struct device *dev) { - const struct lsm9ds0_mfd_config * const config = - dev->config_info; + const struct lsm9ds0_mfd_config * const config = dev->config; struct lsm9ds0_mfd_data *data = dev->driver_data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); diff --git a/drivers/sensor/max17055/max17055.c b/drivers/sensor/max17055/max17055.c index a989a55a14f..90d22ff24e0 100644 --- a/drivers/sensor/max17055/max17055.c +++ b/drivers/sensor/max17055/max17055.c @@ -78,7 +78,7 @@ static void set_millis(struct sensor_value *val, int val_millis) static int max17055_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *valp) { - const struct max17055_config *const config = dev->config_info; + const struct max17055_config *const config = dev->config; struct max17055_data *const priv = dev->driver_data; unsigned int tmp; @@ -200,7 +200,7 @@ static int max17055_sample_fetch(struct device *dev, enum sensor_channel chan) static int max17055_gauge_init(struct device *dev) { struct max17055_data *priv = dev->driver_data; - const struct max17055_config *const config = dev->config_info; + const struct max17055_config *const config = dev->config; priv->i2c = device_get_binding(config->bus_name); if (!priv->i2c) { diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c index 4d643a3a17c..a7dd72aa0e0 100644 --- a/drivers/sensor/max30101/max30101.c +++ b/drivers/sensor/max30101/max30101.c @@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(MAX30101, CONFIG_SENSOR_LOG_LEVEL); static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) { struct max30101_data *data = dev->driver_data; - const struct max30101_config *config = dev->config_info; + const struct max30101_config *config = dev->config; uint8_t buffer[MAX30101_MAX_BYTES_PER_SAMPLE]; uint32_t fifo_data; int fifo_chan; @@ -93,7 +93,7 @@ static const struct sensor_driver_api max30101_driver_api = { static int max30101_init(struct device *dev) { - const struct max30101_config *config = dev->config_info; + const struct max30101_config *config = dev->config; struct max30101_data *data = dev->driver_data; uint8_t part_id; uint8_t mode_cfg; diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c index a1bf360cd04..860cadec905 100644 --- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c +++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c @@ -32,11 +32,11 @@ struct tach_xec_data { #define TACH_XEC_REG_BASE(_dev) \ ((TACH_Type *) \ ((const struct tach_xec_config * const) \ - _dev->config_info)->base_address) + _dev->config)->base_address) #define TACH_XEC_CONFIG(_dev) \ (((const struct counter_xec_config * const) \ - _dev->config_info)) + _dev->config)) #define TACH_XEC_DATA(_dev) \ ((struct tach_xec_data *)dev->driver_data) diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c index d13f7d9b5d7..fc6bb57880e 100644 --- a/drivers/sensor/mcp9808/mcp9808.c +++ b/drivers/sensor/mcp9808/mcp9808.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(MCP9808, CONFIG_SENSOR_LOG_LEVEL); int mcp9808_reg_read(struct device *dev, uint8_t reg, uint16_t *val) { const struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; int rc = i2c_write_read(data->i2c_master, cfg->i2c_addr, ®, sizeof(reg), val, sizeof(*val)); @@ -72,7 +72,7 @@ static const struct sensor_driver_api mcp9808_api_funcs = { int mcp9808_init(struct device *dev) { struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; int rc = 0; data->i2c_master = device_get_binding(cfg->i2c_bus); diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c index 3c51a96e0e8..95c3fa1e99d 100644 --- a/drivers/sensor/mcp9808/mcp9808_trigger.c +++ b/drivers/sensor/mcp9808/mcp9808_trigger.c @@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(MCP9808, CONFIG_SENSOR_LOG_LEVEL); static int mcp9808_reg_write(struct device *dev, uint8_t reg, uint16_t val) { const struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; uint8_t buf[3] = { reg, val >> 8, /* big-endian register storage */ @@ -61,7 +61,7 @@ static inline void setup_int(struct device *dev, bool enable) { const struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; unsigned int flags = enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE; @@ -100,7 +100,7 @@ int mcp9808_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; int rv = 0; setup_int(dev, false); @@ -163,7 +163,7 @@ static void mcp9808_gpio_thread_cb(struct k_work *work) int mcp9808_setup_interrupt(struct device *dev) { struct mcp9808_data *data = dev->driver_data; - const struct mcp9808_config *cfg = dev->config_info; + const struct mcp9808_config *cfg = dev->config; struct device *gpio; int rc = mcp9808_reg_write(dev, MCP9808_REG_CRITICAL, MCP9808_TEMP_ABS_MASK); diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c index a14c0d6d735..a678c672fec 100644 --- a/drivers/sensor/mpr/mpr.c +++ b/drivers/sensor/mpr/mpr.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(MPR, CONFIG_SENSOR_LOG_LEVEL); static int mpr_init(struct device *dev) { struct mpr_data *data = dev->driver_data; - const struct mpr_config *cfg = dev->config_info; + const struct mpr_config *cfg = dev->config; data->i2c_master = device_get_binding(cfg->i2c_bus); if (!data->i2c_master) { @@ -37,7 +37,7 @@ static int mpr_init(struct device *dev) static int mpr_read_reg(struct device *dev) { struct mpr_data *data = dev->driver_data; - const struct mpr_config *cfg = dev->config_info; + const struct mpr_config *cfg = dev->config; uint8_t write_buf[] = { MPR_OUTPUT_MEASUREMENT_COMMAND, 0x00, 0x00 }; uint8_t read_buf[4] = { 0x0 }; diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c index b3c77100ff1..50a8c0fe742 100644 --- a/drivers/sensor/mpu6050/mpu6050.c +++ b/drivers/sensor/mpu6050/mpu6050.c @@ -112,7 +112,7 @@ static int mpu6050_channel_get(struct device *dev, static int mpu6050_sample_fetch(struct device *dev, enum sensor_channel chan) { struct mpu6050_data *drv_data = dev->driver_data; - const struct mpu6050_config *cfg = dev->config_info; + const struct mpu6050_config *cfg = dev->config; int16_t buf[7]; if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, @@ -143,7 +143,7 @@ static const struct sensor_driver_api mpu6050_driver_api = { int mpu6050_init(struct device *dev) { struct mpu6050_data *drv_data = dev->driver_data; - const struct mpu6050_config *cfg = dev->config_info; + const struct mpu6050_config *cfg = dev->config; uint8_t id, i; drv_data->i2c = device_get_binding(cfg->i2c_label); diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c index 5f95b2b5084..ecd2cc559c1 100644 --- a/drivers/sensor/mpu6050/mpu6050_trigger.c +++ b/drivers/sensor/mpu6050/mpu6050_trigger.c @@ -19,7 +19,7 @@ int mpu6050_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { struct mpu6050_data *drv_data = dev->driver_data; - const struct mpu6050_config *cfg = dev->config_info; + const struct mpu6050_config *cfg = dev->config; if (trig->type != SENSOR_TRIG_DATA_READY) { return -ENOTSUP; @@ -46,7 +46,7 @@ static void mpu6050_gpio_callback(struct device *dev, { struct mpu6050_data *drv_data = CONTAINER_OF(cb, struct mpu6050_data, gpio_cb); - const struct mpu6050_config *cfg = drv_data->dev->config_info; + const struct mpu6050_config *cfg = drv_data->dev->config; ARG_UNUSED(pins); @@ -64,7 +64,7 @@ static void mpu6050_thread_cb(void *arg) { struct device *dev = arg; struct mpu6050_data *drv_data = dev->driver_data; - const struct mpu6050_config *cfg = dev->config_info; + const struct mpu6050_config *cfg = dev->config; if (drv_data->data_ready_handler != NULL) { drv_data->data_ready_handler(dev, @@ -104,7 +104,7 @@ static void mpu6050_work_cb(struct k_work *work) int mpu6050_init_interrupt(struct device *dev) { struct mpu6050_data *drv_data = dev->driver_data; - const struct mpu6050_config *cfg = dev->config_info; + const struct mpu6050_config *cfg = dev->config; /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(cfg->int_label); diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c index 926c5490437..315ebc79321 100644 --- a/drivers/sensor/ms5607/ms5607.c +++ b/drivers/sensor/ms5607/ms5607.c @@ -228,7 +228,7 @@ static const struct ms5607_config ms5607_config = { static int ms5607_init(struct device *dev) { - const struct ms5607_config *const config = dev->config_info; + const struct ms5607_config *const config = dev->config; struct ms5607_data *data = dev->driver_data; struct sensor_value val; int err; diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c index 8145bfdd310..913723fa968 100644 --- a/drivers/sensor/ms5837/ms5837.c +++ b/drivers/sensor/ms5837/ms5837.c @@ -100,7 +100,7 @@ static void ms5837_compensate(struct ms5837_data *data, static int ms5837_sample_fetch(struct device *dev, enum sensor_channel channel) { struct ms5837_data *data = dev->driver_data; - const struct ms5837_config *cfg = dev->config_info; + const struct ms5837_config *cfg = dev->config; int err; uint32_t adc_pressure; uint32_t adc_temperature; @@ -246,7 +246,7 @@ static int ms5837_read_prom(struct device *i2c_master, const uint8_t i2c_address static int ms5837_init(struct device *dev) { struct ms5837_data *data = dev->driver_data; - const struct ms5837_config *cfg = dev->config_info; + const struct ms5837_config *cfg = dev->config; int err; uint8_t cmd; diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c index 59f5b5b3659..33094256556 100644 --- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c +++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c @@ -43,7 +43,7 @@ struct temp_kinetis_data { static int temp_kinetis_sample_fetch(struct device *dev, enum sensor_channel chan) { - const struct temp_kinetis_config *config = dev->config_info; + const struct temp_kinetis_config *config = dev->config; struct temp_kinetis_data *data = dev->driver_data; #ifdef CONFIG_TEMP_KINETIS_FILTER uint16_t previous[TEMP_KINETIS_ADC_SAMPLES]; @@ -88,7 +88,7 @@ static int temp_kinetis_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct temp_kinetis_config *config = dev->config_info; + const struct temp_kinetis_config *config = dev->config; struct temp_kinetis_data *data = dev->driver_data; uint16_t adcr_vdd = BIT_MASK(config->adc_seq.resolution); uint16_t adcr_temp25; @@ -139,7 +139,7 @@ static const struct sensor_driver_api temp_kinetis_driver_api = { static int temp_kinetis_init(struct device *dev) { - const struct temp_kinetis_config *config = dev->config_info; + const struct temp_kinetis_config *config = dev->config; struct temp_kinetis_data *data = dev->driver_data; int err; int i; diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index 10e8b280f30..5b61b5a2167 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -180,7 +180,7 @@ static const struct sensor_driver_api sht3xd_driver_api = { static int sht3xd_init(struct device *dev) { struct sht3xd_data *data = dev->driver_data; - const struct sht3xd_config *cfg = dev->config_info; + const struct sht3xd_config *cfg = dev->config; struct device *i2c = device_get_binding(cfg->bus_name); if (i2c == NULL) { diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h index a9d4b932466..325111c6cb1 100644 --- a/drivers/sensor/sht3xd/sht3xd.h +++ b/drivers/sensor/sht3xd/sht3xd.h @@ -88,7 +88,7 @@ struct sht3xd_data { static inline uint8_t sht3xd_i2c_address(struct device *dev) { - const struct sht3xd_config *dcp = dev->config_info; + const struct sht3xd_config *dcp = dev->config; return dcp->base_address; } diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c index ca8451cc7a1..f2a5a085234 100644 --- a/drivers/sensor/sht3xd/sht3xd_trigger.c +++ b/drivers/sensor/sht3xd/sht3xd_trigger.c @@ -86,7 +86,7 @@ static inline void setup_alert(struct device *dev, { struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; const struct sht3xd_config *cfg = - (const struct sht3xd_config *)dev->config_info; + (const struct sht3xd_config *)dev->config; unsigned int flags = enable ? GPIO_INT_EDGE_TO_ACTIVE : GPIO_INT_DISABLE; @@ -115,7 +115,7 @@ int sht3xd_trigger_set(struct device *dev, { struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; const struct sht3xd_config *cfg = - (const struct sht3xd_config *)dev->config_info; + (const struct sht3xd_config *)dev->config; setup_alert(dev, false); @@ -191,7 +191,7 @@ static void sht3xd_work_cb(struct k_work *work) int sht3xd_init_interrupt(struct device *dev) { struct sht3xd_data *data = dev->driver_data; - const struct sht3xd_config *cfg = dev->config_info; + const struct sht3xd_config *cfg = dev->config; struct device *gpio = device_get_binding(cfg->alert_gpio_name); int rc; diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c index d2ef1101b3d..7dfdefb034e 100644 --- a/drivers/sensor/stts751/stts751.c +++ b/drivers/sensor/stts751/stts751.c @@ -169,7 +169,7 @@ static int stts751_init_chip(struct device *dev) static int stts751_init(struct device *dev) { - const struct stts751_config * const config = dev->config_info; + const struct stts751_config * const config = dev->config; struct stts751_data *data = dev->driver_data; data->bus = device_get_binding(config->master_dev_name); diff --git a/drivers/sensor/stts751/stts751_i2c.c b/drivers/sensor/stts751/stts751_i2c.c index 0d26f8637b7..86a4466b9e0 100644 --- a/drivers/sensor/stts751/stts751_i2c.c +++ b/drivers/sensor/stts751/stts751_i2c.c @@ -24,7 +24,7 @@ static int stts751_i2c_read(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct stts751_data *data = dev->driver_data; - const struct stts751_config *cfg = dev->config_info; + const struct stts751_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); @@ -34,7 +34,7 @@ static int stts751_i2c_write(struct device *dev, uint8_t reg_addr, uint8_t *value, uint16_t len) { struct stts751_data *data = dev->driver_data; - const struct stts751_config *cfg = dev->config_info; + const struct stts751_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, reg_addr, value, len); diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c index 0be8629deee..b66fb4912c6 100644 --- a/drivers/sensor/stts751/stts751_trigger.c +++ b/drivers/sensor/stts751/stts751_trigger.c @@ -59,7 +59,7 @@ static void stts751_handle_interrupt(void *arg) { struct device *dev = arg; struct stts751_data *stts751 = dev->driver_data; - const struct stts751_config *cfg = dev->config_info; + const struct stts751_config *cfg = dev->config; struct sensor_trigger thsld_trigger = { .type = SENSOR_TRIG_THRESHOLD, }; @@ -81,7 +81,7 @@ static void stts751_gpio_callback(struct device *dev, { struct stts751_data *stts751 = CONTAINER_OF(cb, struct stts751_data, gpio_cb); - const struct stts751_config *cfg = stts751->dev->config_info; + const struct stts751_config *cfg = stts751->dev->config; ARG_UNUSED(pins); @@ -122,7 +122,7 @@ static void stts751_work_cb(struct k_work *work) int stts751_init_interrupt(struct device *dev) { struct stts751_data *stts751 = dev->driver_data; - const struct stts751_config *cfg = dev->config_info; + const struct stts751_config *cfg = dev->config; int ret; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c index 0b0b45cccec..32e261f10ed 100644 --- a/drivers/sensor/tmp116/tmp116.c +++ b/drivers/sensor/tmp116/tmp116.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(TMP116); static int tmp116_reg_read(struct device *dev, uint8_t reg, uint16_t *val) { struct tmp116_data *drv_data = dev->driver_data; - const struct tmp116_dev_config *cfg = dev->config_info; + const struct tmp116_dev_config *cfg = dev->config; if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, reg, (uint8_t *)val, 2) < 0) { diff --git a/drivers/sensor/wsen_itds/itds.c b/drivers/sensor/wsen_itds/itds.c index d38e434b530..85c53a67cd8 100644 --- a/drivers/sensor/wsen_itds/itds.c +++ b/drivers/sensor/wsen_itds/itds.c @@ -62,7 +62,7 @@ static int itds_get_odr_for_index(struct device *dev, enum itds_odr_const idx, static int itds_accl_odr_set(struct device *dev, uint16_t freq, uint16_t mfreq) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; int start, end, i; bool hp_mode; @@ -91,7 +91,7 @@ static int itds_accl_odr_set(struct device *dev, uint16_t freq, uint16_t mfreq) static int itds_accl_range_set(struct device *dev, int32_t range) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; int i, ret; bool hp_mode; @@ -215,7 +215,7 @@ static int itds_fetch_accel(struct itds_device_data *ddata, static int itds_sample_fetch(struct device *dev, enum sensor_channel chan) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -306,7 +306,7 @@ static int itds_channel_get(struct device *dev, static int itds_init(struct device *dev) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; int ret; uint16_t freq, mfreq; uint8_t rval; diff --git a/drivers/sensor/wsen_itds/itds_trigger.c b/drivers/sensor/wsen_itds/itds_trigger.c index ab05067f964..3217f6cf596 100644 --- a/drivers/sensor/wsen_itds/itds_trigger.c +++ b/drivers/sensor/wsen_itds/itds_trigger.c @@ -20,7 +20,7 @@ static int itds_trigger_drdy_set(struct device *dev, sensor_trigger_handler_t handler) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; uint8_t drdy_en = 0U; int ret; @@ -60,7 +60,7 @@ static void itds_work_handler(struct k_work *work) struct itds_device_data *ddata = CONTAINER_OF(work, struct itds_device_data, work); struct device *dev = (struct device *)ddata->dev; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; uint8_t status; struct sensor_trigger drdy_trigger = { .chan = SENSOR_CHAN_ACCEL_XYZ, @@ -94,7 +94,7 @@ static void itds_gpio_callback(struct device *port, int itds_trigger_mode_init(struct device *dev) { struct itds_device_data *ddata = dev->driver_data; - const struct itds_device_config *cfg = dev->config_info; + const struct itds_device_config *cfg = dev->config; ddata->gpio = device_get_binding(cfg->gpio_port); if (!ddata->gpio) { diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c index 97c54cd3690..2faaf824831 100644 --- a/drivers/serial/leuart_gecko.c +++ b/drivers/serial/leuart_gecko.c @@ -19,7 +19,7 @@ #define CLOCK_LEUART(id) CLOCK_ID_PRFX(LEUART_PREFIX, id) #define DEV_CFG(dev) \ - ((const struct leuart_gecko_config * const)(dev)->config_info) + ((const struct leuart_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct leuart_gecko_data * const)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/serial/uart_altera_jtag_hal.c b/drivers/serial/uart_altera_jtag_hal.c index b4bfee8d2b5..38d4b6dae62 100644 --- a/drivers/serial/uart_altera_jtag_hal.c +++ b/drivers/serial/uart_altera_jtag_hal.c @@ -17,7 +17,7 @@ #define UART_ALTERA_JTAG_CONTROL_REG 1 #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) extern int altera_avalon_jtag_uart_read(altera_avalon_jtag_uart_state *sp, char *buffer, int space, int flags); diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index ea0d96da139..c16abf85bfb 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -47,7 +47,7 @@ static inline struct uart_cc13xx_cc26xx_data *get_dev_data(struct device *dev) static inline const struct uart_device_config *get_dev_conf(struct device *dev) { - return dev->config_info; + return dev->config; } static int uart_cc13xx_cc26xx_poll_in(struct device *dev, unsigned char *c) diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 8ae669dc919..92a74910154 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -25,7 +25,7 @@ struct uart_cc32xx_dev_data_t { }; #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_cc32xx_dev_data_t * const)(dev)->driver_data) diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c index ab4405edce1..9bae2ec70d2 100644 --- a/drivers/serial/uart_cmsdk_apb.c +++ b/drivers/serial/uart_cmsdk_apb.c @@ -77,7 +77,7 @@ struct uart_cmsdk_apb_dev_data { /* convenience defines */ #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_cmsdk_apb_dev_data * const)(dev)->driver_data) #define UART_STRUCT(dev) \ diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c index c83c92dc275..02b9083a959 100644 --- a/drivers/serial/uart_esp32.c +++ b/drivers/serial/uart_esp32.c @@ -98,7 +98,7 @@ struct uart_esp32_data { }; #define DEV_CFG(dev) \ - ((const struct uart_esp32_config *const)(dev)->config_info) + ((const struct uart_esp32_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_esp32_data *)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c index 06d767f3bad..34a262ebef1 100644 --- a/drivers/serial/uart_gecko.c +++ b/drivers/serial/uart_gecko.c @@ -44,7 +44,7 @@ struct uart_gecko_data { static int uart_gecko_poll_in(struct device *dev, unsigned char *c) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t flags = USART_StatusGet(config->base); if (flags & USART_STATUS_RXDATAV) { @@ -57,14 +57,14 @@ static int uart_gecko_poll_in(struct device *dev, unsigned char *c) static void uart_gecko_poll_out(struct device *dev, unsigned char c) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; USART_Tx(config->base, c); } static int uart_gecko_err_check(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t flags = USART_IntGet(config->base); int err = 0; @@ -91,7 +91,7 @@ static int uart_gecko_err_check(struct device *dev) static int uart_gecko_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -106,7 +106,7 @@ static int uart_gecko_fifo_fill(struct device *dev, const uint8_t *tx_data, static int uart_gecko_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -120,7 +120,7 @@ static int uart_gecko_fifo_read(struct device *dev, uint8_t *rx_data, static void uart_gecko_irq_tx_enable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t mask = USART_IEN_TXBL | USART_IEN_TXC; USART_IntEnable(config->base, mask); @@ -128,7 +128,7 @@ static void uart_gecko_irq_tx_enable(struct device *dev) static void uart_gecko_irq_tx_disable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t mask = USART_IEN_TXBL | USART_IEN_TXC; USART_IntDisable(config->base, mask); @@ -136,7 +136,7 @@ static void uart_gecko_irq_tx_disable(struct device *dev) static int uart_gecko_irq_tx_complete(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t flags = USART_IntGet(config->base); USART_IntClear(config->base, USART_IF_TXC); @@ -146,7 +146,7 @@ static int uart_gecko_irq_tx_complete(struct device *dev) static int uart_gecko_irq_tx_ready(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t flags = USART_IntGetEnabled(config->base); return (flags & USART_IF_TXBL) != 0U; @@ -154,7 +154,7 @@ static int uart_gecko_irq_tx_ready(struct device *dev) static void uart_gecko_irq_rx_enable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t mask = USART_IEN_RXDATAV; USART_IntEnable(config->base, mask); @@ -162,7 +162,7 @@ static void uart_gecko_irq_rx_enable(struct device *dev) static void uart_gecko_irq_rx_disable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t mask = USART_IEN_RXDATAV; USART_IntDisable(config->base, mask); @@ -170,7 +170,7 @@ static void uart_gecko_irq_rx_disable(struct device *dev) static int uart_gecko_irq_rx_full(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t flags = USART_IntGet(config->base); return (flags & USART_IF_RXDATAV) != 0U; @@ -178,7 +178,7 @@ static int uart_gecko_irq_rx_full(struct device *dev) static int uart_gecko_irq_rx_ready(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; uint32_t mask = USART_IEN_RXDATAV; return (config->base->IEN & mask) @@ -187,7 +187,7 @@ static int uart_gecko_irq_rx_ready(struct device *dev) static void uart_gecko_irq_err_enable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; USART_IntEnable(config->base, USART_IF_RXOF | USART_IF_PERR | @@ -196,7 +196,7 @@ static void uart_gecko_irq_err_enable(struct device *dev) static void uart_gecko_irq_err_disable(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; USART_IntDisable(config->base, USART_IF_RXOF | USART_IF_PERR | @@ -236,7 +236,7 @@ static void uart_gecko_isr(void *arg) static void uart_gecko_init_pins(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; soc_gpio_configure(&config->pin_rx); soc_gpio_configure(&config->pin_tx); @@ -263,7 +263,7 @@ static void uart_gecko_init_pins(struct device *dev) static int uart_gecko_init(struct device *dev) { - const struct uart_gecko_config *config = dev->config_info; + const struct uart_gecko_config *config = dev->config; USART_InitAsync_TypeDef usartInit = USART_INITASYNC_DEFAULT; /* The peripheral and gpio clock are already enabled from soc and gpio diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c index f26e762ea53..127cc48e4ef 100644 --- a/drivers/serial/uart_imx.c +++ b/drivers/serial/uart_imx.c @@ -22,7 +22,7 @@ #include #define DEV_CFG(dev) \ - ((const struct imx_uart_config *const)(dev)->config_info) + ((const struct imx_uart_config *const)(dev)->config) #define UART_STRUCT(dev) \ ((UART_Type *)(DEV_CFG(dev))->base) @@ -55,7 +55,7 @@ struct imx_uart_data { static int uart_imx_init(struct device *dev) { UART_Type *uart = UART_STRUCT(dev); - const struct imx_uart_config *config = dev->config_info; + const struct imx_uart_config *config = dev->config; unsigned int old_level; /* disable interrupts */ diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c index fdf9b37cb70..3012a784d57 100644 --- a/drivers/serial/uart_lpc11u6x.c +++ b/drivers/serial/uart_lpc11u6x.c @@ -13,7 +13,7 @@ #include "uart_lpc11u6x.h" -#define DEV_CFG(dev) ((dev)->config_info) +#define DEV_CFG(dev) ((dev)->config) #define DEV_DATA(dev) ((dev)->driver_data) #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay) diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c index 333cab0bb50..b9b26781bc1 100644 --- a/drivers/serial/uart_mcux.c +++ b/drivers/serial/uart_mcux.c @@ -34,7 +34,7 @@ struct uart_mcux_data { static int uart_mcux_configure(struct device *dev, const struct uart_config *cfg) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uart_config_t uart_config; struct device *clock_dev; uint32_t clock_freq; @@ -107,7 +107,7 @@ FSL_FEATURE_UART_HAS_STOP_BIT_CONFIG_SUPPORT static int uart_mcux_poll_in(struct device *dev, unsigned char *c) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t flags = UART_GetStatusFlags(config->base); int ret = -1; @@ -121,7 +121,7 @@ static int uart_mcux_poll_in(struct device *dev, unsigned char *c) static void uart_mcux_poll_out(struct device *dev, unsigned char c) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; while (!(UART_GetStatusFlags(config->base) & kUART_TxDataRegEmptyFlag)) { } @@ -131,7 +131,7 @@ static void uart_mcux_poll_out(struct device *dev, unsigned char c) static int uart_mcux_err_check(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t flags = UART_GetStatusFlags(config->base); int err = 0; @@ -158,7 +158,7 @@ static int uart_mcux_err_check(struct device *dev) static int uart_mcux_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -173,7 +173,7 @@ static int uart_mcux_fifo_fill(struct device *dev, const uint8_t *tx_data, static int uart_mcux_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -187,7 +187,7 @@ static int uart_mcux_fifo_read(struct device *dev, uint8_t *rx_data, static void uart_mcux_irq_tx_enable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_TxDataRegEmptyInterruptEnable; UART_EnableInterrupts(config->base, mask); @@ -195,7 +195,7 @@ static void uart_mcux_irq_tx_enable(struct device *dev) static void uart_mcux_irq_tx_disable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_TxDataRegEmptyInterruptEnable; UART_DisableInterrupts(config->base, mask); @@ -203,7 +203,7 @@ static void uart_mcux_irq_tx_disable(struct device *dev) static int uart_mcux_irq_tx_complete(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t flags = UART_GetStatusFlags(config->base); return (flags & kUART_TransmissionCompleteFlag) != 0U; @@ -211,7 +211,7 @@ static int uart_mcux_irq_tx_complete(struct device *dev) static int uart_mcux_irq_tx_ready(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_TxDataRegEmptyInterruptEnable; uint32_t flags = UART_GetStatusFlags(config->base); @@ -221,7 +221,7 @@ static int uart_mcux_irq_tx_ready(struct device *dev) static void uart_mcux_irq_rx_enable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_RxDataRegFullInterruptEnable; UART_EnableInterrupts(config->base, mask); @@ -229,7 +229,7 @@ static void uart_mcux_irq_rx_enable(struct device *dev) static void uart_mcux_irq_rx_disable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_RxDataRegFullInterruptEnable; UART_DisableInterrupts(config->base, mask); @@ -237,7 +237,7 @@ static void uart_mcux_irq_rx_disable(struct device *dev) static int uart_mcux_irq_rx_full(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t flags = UART_GetStatusFlags(config->base); return (flags & kUART_RxDataRegFullFlag) != 0U; @@ -245,7 +245,7 @@ static int uart_mcux_irq_rx_full(struct device *dev) static int uart_mcux_irq_rx_ready(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_RxDataRegFullInterruptEnable; return (UART_GetEnabledInterrupts(config->base) & mask) @@ -254,7 +254,7 @@ static int uart_mcux_irq_rx_ready(struct device *dev) static void uart_mcux_irq_err_enable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_NoiseErrorInterruptEnable | kUART_FramingErrorInterruptEnable | kUART_ParityErrorInterruptEnable; @@ -264,7 +264,7 @@ static void uart_mcux_irq_err_enable(struct device *dev) static void uart_mcux_irq_err_disable(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; uint32_t mask = kUART_NoiseErrorInterruptEnable | kUART_FramingErrorInterruptEnable | kUART_ParityErrorInterruptEnable; @@ -305,7 +305,7 @@ static void uart_mcux_isr(void *arg) static int uart_mcux_init(struct device *dev) { - const struct uart_mcux_config *config = dev->config_info; + const struct uart_mcux_config *config = dev->config; int err; err = uart_mcux_configure(dev, &config->uart_cfg); diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c index 2bd3be3a6c0..ac95a5c32eb 100644 --- a/drivers/serial/uart_mcux_flexcomm.c +++ b/drivers/serial/uart_mcux_flexcomm.c @@ -40,7 +40,7 @@ struct mcux_flexcomm_data { static int mcux_flexcomm_poll_in(struct device *dev, unsigned char *c) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t flags = USART_GetStatusFlags(config->base); int ret = -1; @@ -55,7 +55,7 @@ static int mcux_flexcomm_poll_in(struct device *dev, unsigned char *c) static void mcux_flexcomm_poll_out(struct device *dev, unsigned char c) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; /* Wait until space is available in TX FIFO */ while (!(USART_GetStatusFlags(config->base) & kUSART_TxFifoEmptyFlag)) { @@ -66,7 +66,7 @@ static void mcux_flexcomm_poll_out(struct device *dev, static int mcux_flexcomm_err_check(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t flags = USART_GetStatusFlags(config->base); int err = 0; @@ -94,7 +94,7 @@ static int mcux_flexcomm_err_check(struct device *dev) static int mcux_flexcomm_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -110,7 +110,7 @@ static int mcux_flexcomm_fifo_fill(struct device *dev, const uint8_t *tx_data, static int mcux_flexcomm_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -125,7 +125,7 @@ static int mcux_flexcomm_fifo_read(struct device *dev, uint8_t *rx_data, static void mcux_flexcomm_irq_tx_enable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_TxLevelInterruptEnable; USART_EnableInterrupts(config->base, mask); @@ -133,7 +133,7 @@ static void mcux_flexcomm_irq_tx_enable(struct device *dev) static void mcux_flexcomm_irq_tx_disable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_TxLevelInterruptEnable; USART_DisableInterrupts(config->base, mask); @@ -141,14 +141,14 @@ static void mcux_flexcomm_irq_tx_disable(struct device *dev) static int mcux_flexcomm_irq_tx_complete(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; return (config->base->STAT & USART_STAT_TXIDLE_MASK) != 0; } static int mcux_flexcomm_irq_tx_ready(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_TxLevelInterruptEnable; uint32_t flags = USART_GetStatusFlags(config->base); @@ -158,7 +158,7 @@ static int mcux_flexcomm_irq_tx_ready(struct device *dev) static void mcux_flexcomm_irq_rx_enable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_RxLevelInterruptEnable; USART_EnableInterrupts(config->base, mask); @@ -166,7 +166,7 @@ static void mcux_flexcomm_irq_rx_enable(struct device *dev) static void mcux_flexcomm_irq_rx_disable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_RxLevelInterruptEnable; USART_DisableInterrupts(config->base, mask); @@ -174,7 +174,7 @@ static void mcux_flexcomm_irq_rx_disable(struct device *dev) static int mcux_flexcomm_irq_rx_full(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t flags = USART_GetStatusFlags(config->base); return (flags & kUSART_RxFifoNotEmptyFlag) != 0U; @@ -182,7 +182,7 @@ static int mcux_flexcomm_irq_rx_full(struct device *dev) static int mcux_flexcomm_irq_rx_ready(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kUSART_RxLevelInterruptEnable; return (USART_GetEnabledInterrupts(config->base) & mask) @@ -191,7 +191,7 @@ static int mcux_flexcomm_irq_rx_ready(struct device *dev) static void mcux_flexcomm_irq_err_enable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kStatus_USART_NoiseError | kStatus_USART_FramingError | kStatus_USART_ParityError; @@ -201,7 +201,7 @@ static void mcux_flexcomm_irq_err_enable(struct device *dev) static void mcux_flexcomm_irq_err_disable(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; uint32_t mask = kStatus_USART_NoiseError | kStatus_USART_FramingError | kStatus_USART_ParityError; @@ -244,7 +244,7 @@ static void mcux_flexcomm_isr(void *arg) static int mcux_flexcomm_init(struct device *dev) { - const struct mcux_flexcomm_config *config = dev->config_info; + const struct mcux_flexcomm_config *config = dev->config; usart_config_t usart_config; uint32_t clock_freq; diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c index bc4b2a4b063..f01d3415577 100644 --- a/drivers/serial/uart_mcux_lpsci.c +++ b/drivers/serial/uart_mcux_lpsci.c @@ -32,7 +32,7 @@ struct mcux_lpsci_data { static int mcux_lpsci_poll_in(struct device *dev, unsigned char *c) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t flags = LPSCI_GetStatusFlags(config->base); int ret = -1; @@ -46,7 +46,7 @@ static int mcux_lpsci_poll_in(struct device *dev, unsigned char *c) static void mcux_lpsci_poll_out(struct device *dev, unsigned char c) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; while (!(LPSCI_GetStatusFlags(config->base) & kLPSCI_TxDataRegEmptyFlag)) { @@ -57,7 +57,7 @@ static void mcux_lpsci_poll_out(struct device *dev, unsigned char c) static int mcux_lpsci_err_check(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t flags = LPSCI_GetStatusFlags(config->base); int err = 0; @@ -84,7 +84,7 @@ static int mcux_lpsci_err_check(struct device *dev) static int mcux_lpsci_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -100,7 +100,7 @@ static int mcux_lpsci_fifo_fill(struct device *dev, const uint8_t *tx_data, static int mcux_lpsci_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -115,7 +115,7 @@ static int mcux_lpsci_fifo_read(struct device *dev, uint8_t *rx_data, static void mcux_lpsci_irq_tx_enable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; LPSCI_EnableInterrupts(config->base, mask); @@ -123,7 +123,7 @@ static void mcux_lpsci_irq_tx_enable(struct device *dev) static void mcux_lpsci_irq_tx_disable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; LPSCI_DisableInterrupts(config->base, mask); @@ -131,7 +131,7 @@ static void mcux_lpsci_irq_tx_disable(struct device *dev) static int mcux_lpsci_irq_tx_complete(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t flags = LPSCI_GetStatusFlags(config->base); return (flags & kLPSCI_TransmissionCompleteFlag) != 0U; @@ -139,7 +139,7 @@ static int mcux_lpsci_irq_tx_complete(struct device *dev) static int mcux_lpsci_irq_tx_ready(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_TxDataRegEmptyInterruptEnable; uint32_t flags = LPSCI_GetStatusFlags(config->base); @@ -149,7 +149,7 @@ static int mcux_lpsci_irq_tx_ready(struct device *dev) static void mcux_lpsci_irq_rx_enable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable; LPSCI_EnableInterrupts(config->base, mask); @@ -157,7 +157,7 @@ static void mcux_lpsci_irq_rx_enable(struct device *dev) static void mcux_lpsci_irq_rx_disable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable; LPSCI_DisableInterrupts(config->base, mask); @@ -165,7 +165,7 @@ static void mcux_lpsci_irq_rx_disable(struct device *dev) static int mcux_lpsci_irq_rx_full(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t flags = LPSCI_GetStatusFlags(config->base); return (flags & kLPSCI_RxDataRegFullFlag) != 0U; @@ -173,7 +173,7 @@ static int mcux_lpsci_irq_rx_full(struct device *dev) static int mcux_lpsci_irq_rx_ready(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_RxDataRegFullInterruptEnable; return (LPSCI_GetEnabledInterrupts(config->base) & mask) @@ -182,7 +182,7 @@ static int mcux_lpsci_irq_rx_ready(struct device *dev) static void mcux_lpsci_irq_err_enable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_NoiseErrorInterruptEnable | kLPSCI_FramingErrorInterruptEnable | kLPSCI_ParityErrorInterruptEnable; @@ -192,7 +192,7 @@ static void mcux_lpsci_irq_err_enable(struct device *dev) static void mcux_lpsci_irq_err_disable(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; uint32_t mask = kLPSCI_NoiseErrorInterruptEnable | kLPSCI_FramingErrorInterruptEnable | kLPSCI_ParityErrorInterruptEnable; @@ -234,7 +234,7 @@ static void mcux_lpsci_isr(void *arg) static int mcux_lpsci_init(struct device *dev) { - const struct mcux_lpsci_config *config = dev->config_info; + const struct mcux_lpsci_config *config = dev->config; lpsci_config_t uart_config; struct device *clock_dev; uint32_t clock_freq; diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c index fbcb9cdf80e..fbadbcad2b5 100644 --- a/drivers/serial/uart_mcux_lpuart.c +++ b/drivers/serial/uart_mcux_lpuart.c @@ -32,7 +32,7 @@ struct mcux_lpuart_data { static int mcux_lpuart_poll_in(struct device *dev, unsigned char *c) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); int ret = -1; @@ -46,7 +46,7 @@ static int mcux_lpuart_poll_in(struct device *dev, unsigned char *c) static void mcux_lpuart_poll_out(struct device *dev, unsigned char c) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; while (!(LPUART_GetStatusFlags(config->base) & kLPUART_TxDataRegEmptyFlag)) { @@ -57,7 +57,7 @@ static void mcux_lpuart_poll_out(struct device *dev, unsigned char c) static int mcux_lpuart_err_check(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); int err = 0; @@ -84,7 +84,7 @@ static int mcux_lpuart_err_check(struct device *dev) static int mcux_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -100,7 +100,7 @@ static int mcux_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data, static int mcux_lpuart_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -115,7 +115,7 @@ static int mcux_lpuart_fifo_read(struct device *dev, uint8_t *rx_data, static void mcux_lpuart_irq_tx_enable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; LPUART_EnableInterrupts(config->base, mask); @@ -123,7 +123,7 @@ static void mcux_lpuart_irq_tx_enable(struct device *dev) static void mcux_lpuart_irq_tx_disable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; LPUART_DisableInterrupts(config->base, mask); @@ -131,7 +131,7 @@ static void mcux_lpuart_irq_tx_disable(struct device *dev) static int mcux_lpuart_irq_tx_complete(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); return (flags & kLPUART_TransmissionCompleteFlag) != 0U; @@ -139,7 +139,7 @@ static int mcux_lpuart_irq_tx_complete(struct device *dev) static int mcux_lpuart_irq_tx_ready(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; uint32_t flags = LPUART_GetStatusFlags(config->base); @@ -149,7 +149,7 @@ static int mcux_lpuart_irq_tx_ready(struct device *dev) static void mcux_lpuart_irq_rx_enable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; LPUART_EnableInterrupts(config->base, mask); @@ -157,7 +157,7 @@ static void mcux_lpuart_irq_rx_enable(struct device *dev) static void mcux_lpuart_irq_rx_disable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; LPUART_DisableInterrupts(config->base, mask); @@ -165,7 +165,7 @@ static void mcux_lpuart_irq_rx_disable(struct device *dev) static int mcux_lpuart_irq_rx_full(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); return (flags & kLPUART_RxDataRegFullFlag) != 0U; @@ -173,7 +173,7 @@ static int mcux_lpuart_irq_rx_full(struct device *dev) static int mcux_lpuart_irq_rx_ready(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; return (LPUART_GetEnabledInterrupts(config->base) & mask) @@ -182,7 +182,7 @@ static int mcux_lpuart_irq_rx_ready(struct device *dev) static void mcux_lpuart_irq_err_enable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_NoiseErrorInterruptEnable | kLPUART_FramingErrorInterruptEnable | kLPUART_ParityErrorInterruptEnable; @@ -192,7 +192,7 @@ static void mcux_lpuart_irq_err_enable(struct device *dev) static void mcux_lpuart_irq_err_disable(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; uint32_t mask = kLPUART_NoiseErrorInterruptEnable | kLPUART_FramingErrorInterruptEnable | kLPUART_ParityErrorInterruptEnable; @@ -234,7 +234,7 @@ static void mcux_lpuart_isr(void *arg) static int mcux_lpuart_init(struct device *dev) { - const struct mcux_lpuart_config *config = dev->config_info; + const struct mcux_lpuart_config *config = dev->config; lpuart_config_t uart_config; struct device *clock_dev; uint32_t clock_freq; diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c index cc6cb0e8184..dfe1f11f70a 100644 --- a/drivers/serial/uart_miv.c +++ b/drivers/serial/uart_miv.c @@ -146,7 +146,7 @@ struct uart_miv_data { #define DEV_CFG(dev) \ ((const struct uart_miv_device_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_UART(dev) \ ((struct uart_miv_regs_t *)(DEV_CFG(dev))->uart_addr) #define DEV_DATA(dev) \ diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c index 7b65787b0e6..b54b6238ef0 100644 --- a/drivers/serial/uart_msp432p4xx.c +++ b/drivers/serial/uart_msp432p4xx.c @@ -29,7 +29,7 @@ struct uart_msp432p4xx_dev_data_t { }; #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_msp432p4xx_dev_data_t * const)(dev)->driver_data) diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index f49825860f4..e68163ccddf 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -146,7 +146,7 @@ static inline struct uarte_nrfx_data *get_dev_data(struct device *dev) static inline const struct uarte_nrfx_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static inline NRF_UARTE_Type *get_uarte_instance(struct device *dev) diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index d99b46f5c9f..9dcd76680fc 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -203,7 +203,7 @@ BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "NS16550(s) in DT need CONFIG_PCIE"); #define DEV_CFG(dev) \ ((const struct uart_ns16550_device_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_DATA(dev) \ ((struct uart_ns16550_dev_data_t *)(dev)->driver_data) diff --git a/drivers/serial/uart_nuvoton.c b/drivers/serial/uart_nuvoton.c index 7cc57ee3b66..6d0d11cbe44 100644 --- a/drivers/serial/uart_nuvoton.c +++ b/drivers/serial/uart_nuvoton.c @@ -13,7 +13,7 @@ /* Device data structure */ #define DEV_CFG(dev) \ - ((const struct uart_numicro_config * const)(dev)->config_info) + ((const struct uart_numicro_config * const)(dev)->config) #define DRV_DATA(dev) \ ((struct uart_numicro_data * const)(dev)->driver_data) diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c index d07d18003a7..0581afb117b 100644 --- a/drivers/serial/uart_pl011.c +++ b/drivers/serial/uart_pl011.c @@ -141,7 +141,7 @@ struct pl011_data { PL011_IMSC_RTIM) #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct pl011_data *)(dev)->driver_data) #define PL011_REGS(dev) \ diff --git a/drivers/serial/uart_psoc6.c b/drivers/serial/uart_psoc6.c index a9a5dd31780..8848beaba22 100644 --- a/drivers/serial/uart_psoc6.c +++ b/drivers/serial/uart_psoc6.c @@ -94,7 +94,7 @@ static const cy_stc_scb_uart_config_t uartConfig = { */ static int uart_psoc6_init(struct device *dev) { - const struct cypress_psoc6_config *config = dev->config_info; + const struct cypress_psoc6_config *config = dev->config; /* Connect SCB5 UART function to pins */ Cy_GPIO_SetHSIOM(config->port, config->rx_num, config->rx_val); @@ -125,7 +125,7 @@ static int uart_psoc6_init(struct device *dev) static int uart_psoc6_poll_in(struct device *dev, unsigned char *c) { - const struct cypress_psoc6_config *config = dev->config_info; + const struct cypress_psoc6_config *config = dev->config; uint32_t rec; rec = Cy_SCB_UART_Get(config->base); @@ -136,7 +136,7 @@ static int uart_psoc6_poll_in(struct device *dev, unsigned char *c) static void uart_psoc6_poll_out(struct device *dev, unsigned char c) { - const struct cypress_psoc6_config *config = dev->config_info; + const struct cypress_psoc6_config *config = dev->config; while (Cy_SCB_UART_Put(config->base, (uint32_t)c) != 1UL) { } diff --git a/drivers/serial/uart_rtt.c b/drivers/serial/uart_rtt.c index 62c84aa6dcc..65b9573e444 100644 --- a/drivers/serial/uart_rtt.c +++ b/drivers/serial/uart_rtt.c @@ -17,7 +17,7 @@ struct uart_rtt_config { static inline const struct uart_rtt_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static int uart_rtt_init(struct device *dev) diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c index d4ea98ec2b8..f336ffae382 100644 --- a/drivers/serial/uart_rv32m1_lpuart.c +++ b/drivers/serial/uart_rv32m1_lpuart.c @@ -36,7 +36,7 @@ struct rv32m1_lpuart_data { static int rv32m1_lpuart_poll_in(struct device *dev, unsigned char *c) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); int ret = -1; @@ -50,7 +50,7 @@ static int rv32m1_lpuart_poll_in(struct device *dev, unsigned char *c) static void rv32m1_lpuart_poll_out(struct device *dev, unsigned char c) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; while (!(LPUART_GetStatusFlags(config->base) & kLPUART_TxDataRegEmptyFlag)) { @@ -61,7 +61,7 @@ static void rv32m1_lpuart_poll_out(struct device *dev, unsigned char c) static int rv32m1_lpuart_err_check(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); int err = 0; @@ -88,7 +88,7 @@ static int rv32m1_lpuart_err_check(struct device *dev) static int rv32m1_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data, int len) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint8_t num_tx = 0U; while ((len - num_tx > 0) && @@ -104,7 +104,7 @@ static int rv32m1_lpuart_fifo_fill(struct device *dev, const uint8_t *tx_data, static int rv32m1_lpuart_fifo_read(struct device *dev, uint8_t *rx_data, const int len) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint8_t num_rx = 0U; while ((len - num_rx > 0) && @@ -119,7 +119,7 @@ static int rv32m1_lpuart_fifo_read(struct device *dev, uint8_t *rx_data, static void rv32m1_lpuart_irq_tx_enable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; LPUART_EnableInterrupts(config->base, mask); @@ -127,7 +127,7 @@ static void rv32m1_lpuart_irq_tx_enable(struct device *dev) static void rv32m1_lpuart_irq_tx_disable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; LPUART_DisableInterrupts(config->base, mask); @@ -135,7 +135,7 @@ static void rv32m1_lpuart_irq_tx_disable(struct device *dev) static int rv32m1_lpuart_irq_tx_complete(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); return (flags & kLPUART_TxDataRegEmptyFlag) != 0U; @@ -143,7 +143,7 @@ static int rv32m1_lpuart_irq_tx_complete(struct device *dev) static int rv32m1_lpuart_irq_tx_ready(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_TxDataRegEmptyInterruptEnable; return (LPUART_GetEnabledInterrupts(config->base) & mask) @@ -152,7 +152,7 @@ static int rv32m1_lpuart_irq_tx_ready(struct device *dev) static void rv32m1_lpuart_irq_rx_enable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; LPUART_EnableInterrupts(config->base, mask); @@ -160,7 +160,7 @@ static void rv32m1_lpuart_irq_rx_enable(struct device *dev) static void rv32m1_lpuart_irq_rx_disable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; LPUART_DisableInterrupts(config->base, mask); @@ -168,7 +168,7 @@ static void rv32m1_lpuart_irq_rx_disable(struct device *dev) static int rv32m1_lpuart_irq_rx_full(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t flags = LPUART_GetStatusFlags(config->base); return (flags & kLPUART_RxDataRegFullFlag) != 0U; @@ -176,7 +176,7 @@ static int rv32m1_lpuart_irq_rx_full(struct device *dev) static int rv32m1_lpuart_irq_rx_ready(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_RxDataRegFullInterruptEnable; return (LPUART_GetEnabledInterrupts(config->base) & mask) @@ -185,7 +185,7 @@ static int rv32m1_lpuart_irq_rx_ready(struct device *dev) static void rv32m1_lpuart_irq_err_enable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_NoiseErrorInterruptEnable | kLPUART_FramingErrorInterruptEnable | kLPUART_ParityErrorInterruptEnable; @@ -195,7 +195,7 @@ static void rv32m1_lpuart_irq_err_enable(struct device *dev) static void rv32m1_lpuart_irq_err_disable(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; uint32_t mask = kLPUART_NoiseErrorInterruptEnable | kLPUART_FramingErrorInterruptEnable | kLPUART_ParityErrorInterruptEnable; @@ -237,7 +237,7 @@ static void rv32m1_lpuart_isr(void *arg) static int rv32m1_lpuart_init(struct device *dev) { - const struct rv32m1_lpuart_config *config = dev->config_info; + const struct rv32m1_lpuart_config *config = dev->config; lpuart_config_t uart_config; struct device *clock_dev; uint32_t clock_freq; diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c index 30a8abd0214..88e07264047 100644 --- a/drivers/serial/uart_sam.c +++ b/drivers/serial/uart_sam.c @@ -44,7 +44,7 @@ struct uart_sam_dev_data { }; #define DEV_CFG(dev) \ - ((const struct uart_sam_dev_cfg *const)(dev)->config_info) + ((const struct uart_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_sam_dev_data *const)(dev)->driver_data) diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c index 85c2f947765..1215a74da3b 100644 --- a/drivers/serial/uart_sam0.c +++ b/drivers/serial/uart_sam0.c @@ -78,7 +78,7 @@ struct uart_sam0_dev_data { }; #define DEV_CFG(dev) \ - ((const struct uart_sam0_dev_cfg *const)(dev)->config_info) + ((const struct uart_sam0_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) ((struct uart_sam0_dev_data * const)(dev)->driver_data) static void wait_synchronization(SercomUsart *const usart) diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c index 9750b7b82b5..d5c1fdd8ad6 100644 --- a/drivers/serial/uart_sifive.c +++ b/drivers/serial/uart_sifive.c @@ -66,7 +66,7 @@ struct uart_sifive_data { #define DEV_CFG(dev) \ ((const struct uart_sifive_device_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_UART(dev) \ ((struct uart_sifive_regs_t *)(DEV_CFG(dev))->port) #define DEV_DATA(dev) \ diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c index d2e7349d5b1..22742737180 100644 --- a/drivers/serial/uart_stellaris.c +++ b/drivers/serial/uart_stellaris.c @@ -80,7 +80,7 @@ struct uart_stellaris_dev_data_t { /* convenience defines */ #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_stellaris_dev_data_t * const)(dev)->driver_data) #define UART_STRUCT(dev) \ diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index dd3811b1fd4..47c05bdba70 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(uart_stm32); /* convenience defines */ #define DEV_CFG(dev) \ - ((const struct uart_stm32_config * const)(dev)->config_info) + ((const struct uart_stm32_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_stm32_data * const)(dev)->driver_data) #define UART_STRUCT(dev) \ diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c index f34163dd8e9..2ad22814abc 100644 --- a/drivers/serial/uart_xlnx_ps.c +++ b/drivers/serial/uart_xlnx_ps.c @@ -152,7 +152,7 @@ struct uart_xlnx_ps_dev_data_t { #define DEV_CFG(dev) \ ((const struct uart_xlnx_ps_dev_config * const) \ - (dev)->config_info) + (dev)->config) #define DEV_DATA(dev) \ ((struct uart_xlnx_ps_dev_data_t *)(dev)->driver_data) diff --git a/drivers/serial/uart_xmc4xxx.c b/drivers/serial/uart_xmc4xxx.c index d1a8dac623d..8331715aec1 100644 --- a/drivers/serial/uart_xmc4xxx.c +++ b/drivers/serial/uart_xmc4xxx.c @@ -16,7 +16,7 @@ struct uart_xmc4xxx_data { }; #define DEV_CFG(dev) \ - ((const struct uart_device_config * const)(dev)->config_info) + ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ ((struct uart_xmc4xxx_data * const)(dev)->driver_data) diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c index aa1090ab20a..13565f29187 100644 --- a/drivers/serial/usart_sam.c +++ b/drivers/serial/usart_sam.c @@ -44,7 +44,7 @@ struct usart_sam_dev_data { }; #define DEV_CFG(dev) \ - ((const struct usart_sam_dev_cfg *const)(dev)->config_info) + ((const struct usart_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ ((struct usart_sam_dev_data *const)(dev)->driver_data) diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index dfdc518a73d..e953683b31b 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -47,7 +47,7 @@ static inline struct spi_cc13xx_cc26xx_data *get_dev_data(struct device *dev) static inline const struct spi_cc13xx_cc26xx_config * get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static int spi_cc13xx_cc26xx_configure(struct device *dev, diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index 25a4c020ebb..a51ef993b29 100644 --- a/drivers/spi/spi_dw.c +++ b/drivers/spi/spi_dw.c @@ -55,7 +55,7 @@ static inline bool spi_dw_is_slave(struct spi_dw_data *spi) static void completed(struct device *dev, int error) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; if (error) { @@ -87,7 +87,7 @@ out: static void push_data(struct device *dev) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; uint32_t data = 0U; uint32_t f_tx; @@ -156,7 +156,7 @@ static void push_data(struct device *dev) static void pull_data(struct device *dev) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; DBG_COUNTER_INIT(); @@ -336,7 +336,7 @@ static int transceive(struct device *dev, bool asynchronous, struct k_poll_signal *signal) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; uint32_t tmod = DW_SPI_CTRLR0_TMOD_TX_RX; uint32_t reg_data; @@ -478,7 +478,7 @@ static int spi_dw_release(struct device *dev, const struct spi_config *config) void spi_dw_isr(struct device *dev) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; uint32_t int_status; int error; @@ -517,7 +517,7 @@ static const struct spi_driver_api dw_spi_api = { int spi_dw_init(struct device *dev) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; clock_config(dev); diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h index 4954df18a1d..c44e72b5070 100644 --- a/drivers/spi/spi_dw.h +++ b/drivers/spi/spi_dw.h @@ -231,7 +231,7 @@ DEFINE_TEST_BIT_OP(sr_busy, DW_SPI_REG_SR, DW_SPI_SR_BUSY_BIT) static inline int clock_config(struct device *dev) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; struct spi_dw_data *spi = dev->driver_data; if (!info->clock_name || strlen(info->clock_name) == 0) { @@ -252,7 +252,7 @@ static inline void clock_on(struct device *dev) struct spi_dw_data *spi = dev->driver_data; if (spi->clock) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; clock_control_on(spi->clock, info->clock_data); } @@ -265,7 +265,7 @@ static inline void clock_off(struct device *dev) struct spi_dw_data *spi = dev->driver_data; if (spi->clock) { - const struct spi_dw_config *info = dev->config_info; + const struct spi_dw_config *info = dev->config; clock_control_off(spi->clock, info->clock_data); } diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c index 5e376b09514..bea11e03329 100644 --- a/drivers/spi/spi_gecko.c +++ b/drivers/spi/spi_gecko.c @@ -53,7 +53,7 @@ struct spi_gecko_config { static int spi_config(struct device *dev, const struct spi_config *config, uint16_t *control) { - const struct spi_gecko_config *gecko_config = dev->config_info; + const struct spi_gecko_config *gecko_config = dev->config; struct spi_gecko_data *data = DEV_DATA(dev); if (SPI_WORD_SIZE_GET(config->operation) != SPI_WORD_SIZE) { @@ -168,7 +168,7 @@ static void spi_gecko_xfer(struct device *dev, { int ret; struct spi_context *ctx = &DEV_DATA(dev)->ctx; - const struct spi_gecko_config *gecko_config = dev->config_info; + const struct spi_gecko_config *gecko_config = dev->config; struct spi_gecko_data *data = DEV_DATA(dev); spi_context_cs_control(ctx, true); @@ -183,7 +183,7 @@ static void spi_gecko_xfer(struct device *dev, static void spi_gecko_init_pins(struct device *dev) { - const struct spi_gecko_config *config = dev->config_info; + const struct spi_gecko_config *config = dev->config; soc_gpio_configure(&config->pin_rx); soc_gpio_configure(&config->pin_tx); @@ -208,7 +208,7 @@ static void spi_gecko_init_pins(struct device *dev) static int spi_gecko_init(struct device *dev) { - const struct spi_gecko_config *config = dev->config_info; + const struct spi_gecko_config *config = dev->config; USART_InitSync_TypeDef usartInit = USART_INITSYNC_DEFAULT; /* The peripheral and gpio clock are already enabled from soc and gpio @@ -269,7 +269,7 @@ static int spi_gecko_transceive_async(struct device *dev, static int spi_gecko_release(struct device *dev, const struct spi_config *config) { - const struct spi_gecko_config *gecko_config = dev->config_info; + const struct spi_gecko_config *gecko_config = dev->config; if (!(gecko_config->base->STATUS & USART_STATUS_TXIDLE)) { return -EBUSY; diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c index ee670365d79..671532af1da 100644 --- a/drivers/spi/spi_ll_stm32.c +++ b/drivers/spi/spi_ll_stm32.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(spi_ll_stm32); #include "spi_ll_stm32.h" #define DEV_CFG(dev) \ -(const struct spi_stm32_config * const)(dev->config_info) +(const struct spi_stm32_config * const)(dev->config) #define DEV_DATA(dev) \ (struct spi_stm32_data * const)(dev->driver_data) @@ -411,7 +411,7 @@ static void spi_stm32_complete(struct spi_stm32_data *data, SPI_TypeDef *spi, static void spi_stm32_isr(void *arg) { struct device * const dev = (struct device *) arg; - const struct spi_stm32_config *cfg = dev->config_info; + const struct spi_stm32_config *cfg = dev->config; struct spi_stm32_data *data = dev->driver_data; SPI_TypeDef *spi = cfg->spi; int err; @@ -792,7 +792,7 @@ static const struct spi_driver_api api_funcs = { static int spi_stm32_init(struct device *dev) { struct spi_stm32_data *data __attribute__((unused)) = dev->driver_data; - const struct spi_stm32_config *cfg = dev->config_info; + const struct spi_stm32_config *cfg = dev->config; __ASSERT_NO_MSG(device_get_binding(STM32_CLOCK_CONTROL_NAME)); diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c index a57df2ccc40..e22b4efb961 100644 --- a/drivers/spi/spi_mcux_dspi.c +++ b/drivers/spi/spi_mcux_dspi.c @@ -36,7 +36,7 @@ struct spi_mcux_data { static int spi_mcux_transfer_next_packet(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; @@ -106,7 +106,7 @@ static int spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; @@ -128,7 +128,7 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; dspi_master_config_t master_config; @@ -268,7 +268,7 @@ static int spi_mcux_release(struct device *dev, static int spi_mcux_init(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c index fd31b149afa..ff58329ec31 100644 --- a/drivers/spi/spi_mcux_flexcomm.c +++ b/drivers/spi/spi_mcux_flexcomm.c @@ -32,7 +32,7 @@ struct spi_mcux_data { static void spi_mcux_transfer_next_packet(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; @@ -95,7 +95,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; @@ -117,7 +117,7 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; SPI_Type *base = config->base; spi_master_config_t master_config; @@ -245,7 +245,7 @@ static int spi_mcux_release(struct device *dev, static int spi_mcux_init(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c index f91e6c8acba..da4e0350b2f 100644 --- a/drivers/spi/spi_mcux_lpspi.c +++ b/drivers/spi/spi_mcux_lpspi.c @@ -38,7 +38,7 @@ struct spi_mcux_data { static void spi_mcux_transfer_next_packet(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; @@ -106,7 +106,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; @@ -128,7 +128,7 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; @@ -264,7 +264,7 @@ static int spi_mcux_release(struct device *dev, static int spi_mcux_init(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index 174a3bcc3f0..33474d024cc 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -35,7 +35,7 @@ static inline struct spi_nrfx_data *get_dev_data(struct device *dev) static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static inline nrf_spi_frequency_t get_nrf_spi_frequency(uint32_t frequency) diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index db30c2a43e3..7da70200432 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -40,7 +40,7 @@ static inline struct spi_nrfx_data *get_dev_data(struct device *dev) static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static inline nrf_spim_frequency_t get_nrf_spim_frequency(uint32_t frequency) diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c index 92e96dc952c..cc65f1f6492 100644 --- a/drivers/spi/spi_nrfx_spis.c +++ b/drivers/spi/spi_nrfx_spis.c @@ -30,7 +30,7 @@ static inline struct spi_nrfx_data *get_dev_data(struct device *dev) static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } static inline nrf_spis_mode_t get_nrf_spis_mode(uint16_t operation) diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c index b304eddc6b6..1e81ec1bf66 100644 --- a/drivers/spi/spi_oc_simple.c +++ b/drivers/spi/spi_oc_simple.c @@ -90,7 +90,7 @@ int spi_oc_simple_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_oc_simple_cfg *info = dev->config_info; + const struct spi_oc_simple_cfg *info = dev->config; struct spi_oc_simple_data *spi = SPI_OC_SIMPLE_DATA(dev); struct spi_context *ctx = &spi->ctx; @@ -184,7 +184,7 @@ static struct spi_driver_api spi_oc_simple_api = { int spi_oc_simple_init(struct device *dev) { - const struct spi_oc_simple_cfg *info = dev->config_info; + const struct spi_oc_simple_cfg *info = dev->config; /* Clear chip selects */ sys_write8(0, SPI_OC_SIMPLE_SPSS(info)); diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c index 1f576753c6a..f60415b78b6 100644 --- a/drivers/spi/spi_rv32m1_lpspi.c +++ b/drivers/spi/spi_rv32m1_lpspi.c @@ -39,7 +39,7 @@ struct spi_mcux_data { static void spi_mcux_transfer_next_packet(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; @@ -106,7 +106,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev) static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; @@ -128,7 +128,7 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; @@ -260,7 +260,7 @@ static int spi_mcux_release(struct device *dev, static int spi_mcux_init(struct device *dev) { - const struct spi_mcux_config *config = dev->config_info; + const struct spi_mcux_config *config = dev->config; struct spi_mcux_data *data = dev->driver_data; CLOCK_SetIpSrc(config->clock_ip_name, config->clock_ip_src); diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c index 69f4057e196..47ee2a43ef1 100644 --- a/drivers/spi/spi_sam.c +++ b/drivers/spi/spi_sam.c @@ -51,7 +51,7 @@ static int spi_slave_to_mr_pcs(int slave) static int spi_sam_configure(struct device *dev, const struct spi_config *config) { - const struct spi_sam_config *cfg = dev->config_info; + const struct spi_sam_config *cfg = dev->config; struct spi_sam_data *data = dev->driver_data; Spi *regs = cfg->regs; uint32_t spi_mr = 0U, spi_csr = 0U; @@ -272,7 +272,7 @@ static void spi_sam_fast_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_sam_config *cfg = dev->config_info; + const struct spi_sam_config *cfg = dev->config; size_t tx_count = 0; size_t rx_count = 0; Spi *regs = cfg->regs; @@ -361,7 +361,7 @@ static int spi_sam_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_sam_config *cfg = dev->config_info; + const struct spi_sam_config *cfg = dev->config; struct spi_sam_data *data = dev->driver_data; Spi *regs = cfg->regs; int err; @@ -429,7 +429,7 @@ static int spi_sam_release(struct device *dev, static int spi_sam_init(struct device *dev) { - const struct spi_sam_config *cfg = dev->config_info; + const struct spi_sam_config *cfg = dev->config; struct spi_sam_data *data = dev->driver_data; soc_pmc_peripheral_enable(cfg->periph_id); diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c index 41933b244f1..c7b94ea8d73 100644 --- a/drivers/spi/spi_sam0.c +++ b/drivers/spi/spi_sam0.c @@ -68,7 +68,7 @@ static void wait_synchronization(SercomSpi *regs) static int spi_sam0_configure(struct device *dev, const struct spi_config *config) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; SercomSpi *regs = cfg->regs; SERCOM_SPI_CTRLA_Type ctrla = {.reg = 0}; @@ -303,7 +303,7 @@ static void spi_sam0_fast_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; size_t tx_count = 0; size_t rx_count = 0; SercomSpi *regs = cfg->regs; @@ -390,7 +390,7 @@ static int spi_sam0_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; SercomSpi *regs = cfg->regs; int err; @@ -442,7 +442,7 @@ static void spi_sam0_dma_rx_done(struct device *dma_dev, void *arg, static int spi_sam0_dma_rx_load(struct device *dev, uint8_t *buf, size_t len) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; SercomSpi *regs = cfg->regs; struct dma_config dma_cfg = { 0 }; @@ -484,7 +484,7 @@ static int spi_sam0_dma_rx_load(struct device *dev, uint8_t *buf, static int spi_sam0_dma_tx_load(struct device *dev, const uint8_t *buf, size_t len) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; SercomSpi *regs = cfg->regs; struct dma_config dma_cfg = { 0 }; @@ -587,7 +587,7 @@ static void spi_sam0_dma_rx_done(struct device *dma_dev, void *arg, uint32_t id, int error_code) { struct device *dev = arg; - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; int retval; @@ -621,7 +621,7 @@ static int spi_sam0_transceive_async(struct device *dev, const struct spi_buf_set *rx_bufs, struct k_poll_signal *async) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; int retval; @@ -680,7 +680,7 @@ static int spi_sam0_release(struct device *dev, static int spi_sam0_init(struct device *dev) { - const struct spi_sam0_config *cfg = dev->config_info; + const struct spi_sam0_config *cfg = dev->config; struct spi_sam0_data *data = dev->driver_data; SercomSpi *regs = cfg->regs; diff --git a/drivers/spi/spi_sifive.h b/drivers/spi/spi_sifive.h index 23305750b06..4905e55e924 100644 --- a/drivers/spi/spi_sifive.h +++ b/drivers/spi/spi_sifive.h @@ -13,7 +13,7 @@ #include #include -#define SPI_CFG(dev) ((struct spi_sifive_cfg *) ((dev)->config_info)) +#define SPI_CFG(dev) ((struct spi_sifive_cfg *) ((dev)->config)) #define SPI_DATA(dev) ((struct spi_sifive_data *) ((dev)->driver_data)) #define SPI_REG(dev, offset) ((mem_addr_t) (SPI_CFG(dev)->base + (offset))) diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c index 5472f0489f9..2bbda316a94 100644 --- a/drivers/spi/spi_xec_qmspi.c +++ b/drivers/spi/spi_xec_qmspi.c @@ -168,7 +168,7 @@ static uint32_t qmspi_config_get_lines(const struct spi_config *config) static int qmspi_configure(struct device *dev, const struct spi_config *config) { - const struct spi_qmspi_config *cfg = dev->config_info; + const struct spi_qmspi_config *cfg = dev->config; struct spi_qmspi_data *data = dev->driver_data; QMSPI_Type *regs = cfg->regs; uint32_t smode; @@ -508,7 +508,7 @@ static int qmspi_transceive(struct device *dev, const struct spi_buf_set *tx_bufs, const struct spi_buf_set *rx_bufs) { - const struct spi_qmspi_config *cfg = dev->config_info; + const struct spi_qmspi_config *cfg = dev->config; struct spi_qmspi_data *data = dev->driver_data; QMSPI_Type *regs = cfg->regs; const struct spi_buf *ptx; @@ -593,7 +593,7 @@ static int qmspi_release(struct device *dev, const struct spi_config *config) { struct spi_qmspi_data *data = dev->driver_data; - const struct spi_qmspi_config *cfg = dev->config_info; + const struct spi_qmspi_config *cfg = dev->config; QMSPI_Type *regs = cfg->regs; /* Force CS# to de-assert on next unit boundary */ @@ -616,7 +616,7 @@ static int qmspi_release(struct device *dev, */ static int qmspi_init(struct device *dev) { - const struct spi_qmspi_config *cfg = dev->config_info; + const struct spi_qmspi_config *cfg = dev->config; struct spi_qmspi_data *data = dev->driver_data; QMSPI_Type *regs = cfg->regs; diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c index 8f639ee576a..7474f7fb744 100644 --- a/drivers/video/video_mcux_csi.c +++ b/drivers/video/video_mcux_csi.c @@ -50,7 +50,7 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, status_t status, void *user_data) { struct device *dev = user_data; - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; enum video_signal_result result = VIDEO_BUF_DONE; struct video_buffer *vbuf, *vbuf_first = NULL; @@ -115,7 +115,7 @@ done: static int video_mcux_csi_set_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; unsigned int bpp = video_pix_fmt_bpp(fmt->pixelformat); status_t ret; @@ -176,7 +176,7 @@ static int video_mcux_csi_get_fmt(struct device *dev, enum video_endpoint_id ep, static int video_mcux_csi_stream_start(struct device *dev) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; status_t ret; @@ -194,7 +194,7 @@ static int video_mcux_csi_stream_start(struct device *dev) static int video_mcux_csi_stream_stop(struct device *dev) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; status_t ret; @@ -214,7 +214,7 @@ static int video_mcux_csi_stream_stop(struct device *dev) static int video_mcux_csi_flush(struct device *dev, enum video_endpoint_id ep, bool cancel) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; struct video_buf *vbuf; uint32_t buffer_addr; @@ -248,7 +248,7 @@ static int video_mcux_csi_flush(struct device *dev, enum video_endpoint_id ep, static int video_mcux_csi_enqueue(struct device *dev, enum video_endpoint_id ep, struct video_buffer *vbuf) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; unsigned int to_read; status_t ret; @@ -349,7 +349,7 @@ static void video_mcux_csi_isr(void *p) static int video_mcux_csi_init(struct device *dev) { - const struct video_mcux_csi_config *config = dev->config_info; + const struct video_mcux_csi_config *config = dev->config; struct video_mcux_csi_data *data = dev->driver_data; k_fifo_init(&data->fifo_in); diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c index 77bfb4da5e0..0cd481aa5ec 100644 --- a/drivers/watchdog/wdt_esp32.c +++ b/drivers/watchdog/wdt_esp32.c @@ -58,7 +58,7 @@ struct wdt_esp32_config { }; #define DEV_CFG(dev) \ - ((const struct wdt_esp32_config *const)(dev)->config_info) + ((const struct wdt_esp32_config *const)(dev)->config) #define DEV_DATA(dev) \ ((struct wdt_esp32_data *)(dev)->driver_data) #define DEV_BASE(dev) \ diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c index 43c293f06c3..038a22a442c 100644 --- a/drivers/watchdog/wdt_gecko.c +++ b/drivers/watchdog/wdt_gecko.c @@ -44,7 +44,7 @@ struct wdt_gecko_data { #define DEV_DATA(dev) \ ((struct wdt_gecko_data *)(dev)->driver_data) #define DEV_CFG(dev) \ - ((const struct wdt_gecko_cfg *)(dev)->config_info) + ((const struct wdt_gecko_cfg *)(dev)->config) static uint32_t wdt_gecko_get_timeout_from_persel(int perSel) { diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c index cd925265116..f1e2cbf6029 100644 --- a/drivers/watchdog/wdt_mcux_wdog.c +++ b/drivers/watchdog/wdt_mcux_wdog.c @@ -32,7 +32,7 @@ struct mcux_wdog_data { static int mcux_wdog_setup(struct device *dev, uint8_t options) { - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; struct mcux_wdog_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -55,7 +55,7 @@ static int mcux_wdog_setup(struct device *dev, uint8_t options) static int mcux_wdog_disable(struct device *dev) { - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; struct mcux_wdog_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -69,7 +69,7 @@ static int mcux_wdog_disable(struct device *dev) static int mcux_wdog_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; struct mcux_wdog_data *data = dev->driver_data; struct device *clock_dev; uint32_t clock_freq; @@ -118,7 +118,7 @@ static int mcux_wdog_install_timeout(struct device *dev, static int mcux_wdog_feed(struct device *dev, int channel_id) { - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; WDOG_Type *base = config->base; if (channel_id != 0) { @@ -135,7 +135,7 @@ static int mcux_wdog_feed(struct device *dev, int channel_id) static void mcux_wdog_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; struct mcux_wdog_data *data = dev->driver_data; WDOG_Type *base = config->base; uint32_t flags; @@ -150,7 +150,7 @@ static void mcux_wdog_isr(void *arg) static int mcux_wdog_init(struct device *dev) { - const struct mcux_wdog_config *config = dev->config_info; + const struct mcux_wdog_config *config = dev->config; config->irq_config_func(dev); diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c index a8114153b7a..56cf5ca4b57 100644 --- a/drivers/watchdog/wdt_mcux_wdog32.c +++ b/drivers/watchdog/wdt_mcux_wdog32.c @@ -40,7 +40,7 @@ struct mcux_wdog32_data { static int mcux_wdog32_setup(struct device *dev, uint8_t options) { - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; struct mcux_wdog32_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -63,7 +63,7 @@ static int mcux_wdog32_setup(struct device *dev, uint8_t options) static int mcux_wdog32_disable(struct device *dev) { - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; struct mcux_wdog32_data *data = dev->driver_data; WDOG_Type *base = config->base; @@ -80,7 +80,7 @@ static int mcux_wdog32_disable(struct device *dev) static int mcux_wdog32_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; struct mcux_wdog32_data *data = dev->driver_data; uint32_t clock_freq; int div; @@ -139,7 +139,7 @@ static int mcux_wdog32_install_timeout(struct device *dev, static int mcux_wdog32_feed(struct device *dev, int channel_id) { - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; WDOG_Type *base = config->base; if (channel_id != 0) { @@ -156,7 +156,7 @@ static int mcux_wdog32_feed(struct device *dev, int channel_id) static void mcux_wdog32_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; struct mcux_wdog32_data *data = dev->driver_data; WDOG_Type *base = config->base; uint32_t flags; @@ -171,7 +171,7 @@ static void mcux_wdog32_isr(void *arg) static int mcux_wdog32_init(struct device *dev) { - const struct mcux_wdog32_config *config = dev->config_info; + const struct mcux_wdog32_config *config = dev->config; config->irq_config_func(dev); diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c index ec2fa1798a8..7b319605bd9 100644 --- a/drivers/watchdog/wdt_mcux_wwdt.c +++ b/drivers/watchdog/wdt_mcux_wwdt.c @@ -34,7 +34,7 @@ struct mcux_wwdt_data { static int mcux_wwdt_setup(struct device *dev, uint8_t options) { - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; struct mcux_wwdt_data *data = dev->driver_data; WWDT_Type *base = config->base; @@ -51,7 +51,7 @@ static int mcux_wwdt_setup(struct device *dev, uint8_t options) static int mcux_wwdt_disable(struct device *dev) { - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; struct mcux_wwdt_data *data = dev->driver_data; WWDT_Type *base = config->base; @@ -72,7 +72,7 @@ static int mcux_wwdt_disable(struct device *dev) static int mcux_wwdt_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; struct mcux_wwdt_data *data = dev->driver_data; uint32_t clock_freq; @@ -117,7 +117,7 @@ static int mcux_wwdt_install_timeout(struct device *dev, static int mcux_wwdt_feed(struct device *dev, int channel_id) { - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; WWDT_Type *base = config->base; if (channel_id != 0) { @@ -134,7 +134,7 @@ static int mcux_wwdt_feed(struct device *dev, int channel_id) static void mcux_wwdt_isr(void *arg) { struct device *dev = (struct device *)arg; - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; struct mcux_wwdt_data *data = dev->driver_data; WWDT_Type *base = config->base; uint32_t flags; @@ -149,7 +149,7 @@ static void mcux_wwdt_isr(void *arg) static int mcux_wwdt_init(struct device *dev) { - const struct mcux_wwdt_config *config = dev->config_info; + const struct mcux_wwdt_config *config = dev->config; config->irq_config_func(dev); diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c index 1f93e2fae5e..125415388a4 100644 --- a/drivers/watchdog/wdt_nrfx.c +++ b/drivers/watchdog/wdt_nrfx.c @@ -29,7 +29,7 @@ static inline struct wdt_nrfx_data *get_dev_data(struct device *dev) static inline const struct wdt_nrfx_config *get_dev_config(struct device *dev) { - return dev->config_info; + return dev->config; } diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c index 3d5caca889a..d47b2f99120 100644 --- a/drivers/watchdog/wdt_sam.c +++ b/drivers/watchdog/wdt_sam.c @@ -46,7 +46,7 @@ struct wdt_sam_dev_data { static struct wdt_sam_dev_data wdt_sam_data = { 0 }; #define DEV_CFG(dev) \ - ((const struct wdt_sam_dev_cfg *const)(dev)->config_info) + ((const struct wdt_sam_dev_cfg *const)(dev)->config) static void wdt_sam_isr(struct device *dev) { diff --git a/drivers/watchdog/wdt_wwdg_stm32.h b/drivers/watchdog/wdt_wwdg_stm32.h index 9a1f1ad4e22..a809e631cc6 100644 --- a/drivers/watchdog/wdt_wwdg_stm32.h +++ b/drivers/watchdog/wdt_wwdg_stm32.h @@ -37,7 +37,7 @@ struct wwdg_stm32_data { }; #define WWDG_STM32_CFG(dev) \ - ((const struct wwdg_stm32_config *const)(dev)->config_info) + ((const struct wwdg_stm32_config *const)(dev)->config) #define WWDG_STM32_DATA(dev) \ ((struct wwdg_stm32_data *const)(dev)->driver_data) diff --git a/include/drivers/counter.h b/include/drivers/counter.h index 43a2d17ee82..d9f9f093014 100644 --- a/include/drivers/counter.h +++ b/include/drivers/counter.h @@ -211,7 +211,7 @@ __syscall bool counter_is_counting_up(const struct device *dev); static inline bool z_impl_counter_is_counting_up(const struct device *dev) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; return config->flags & COUNTER_CONFIG_INFO_COUNT_UP; } @@ -228,7 +228,7 @@ __syscall uint8_t counter_get_num_of_channels(const struct device *dev); static inline uint8_t z_impl_counter_get_num_of_channels(const struct device *dev) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; return config->channels; } @@ -246,7 +246,7 @@ __syscall uint32_t counter_get_frequency(const struct device *dev); static inline uint32_t z_impl_counter_get_frequency(const struct device *dev) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; return config->freq; } @@ -265,7 +265,7 @@ static inline uint32_t z_impl_counter_us_to_ticks(const struct device *dev, uint64_t us) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; uint64_t ticks = (us * config->freq) / USEC_PER_SEC; return (ticks > (uint64_t)UINT32_MAX) ? UINT32_MAX : ticks; @@ -285,7 +285,7 @@ static inline uint64_t z_impl_counter_ticks_to_us(const struct device *dev, uint32_t ticks) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; return ((uint64_t)ticks * USEC_PER_SEC) / config->freq; } @@ -302,7 +302,7 @@ __syscall uint32_t counter_get_max_top_value(const struct device *dev); static inline uint32_t z_impl_counter_get_max_top_value(const struct device *dev) { const struct counter_config_info *config = - (const struct counter_config_info *)dev->config_info; + (const struct counter_config_info *)dev->config; return config->max_top_value; } diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h index 18a071085f4..93e64939ca0 100644 --- a/include/drivers/gpio.h +++ b/include/drivers/gpio.h @@ -471,7 +471,7 @@ static inline int z_impl_gpio_pin_interrupt_configure(struct device *port, const struct gpio_driver_api *api = (const struct gpio_driver_api *)port->driver_api; const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; const struct gpio_driver_data *const data = (const struct gpio_driver_data *)port->driver_data; enum gpio_int_trig trig; @@ -536,7 +536,7 @@ static inline int gpio_pin_configure(struct device *port, gpio_pin_t pin, const struct gpio_driver_api *api = (const struct gpio_driver_api *)port->driver_api; const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; struct gpio_driver_data *data = (struct gpio_driver_data *)port->driver_data; int ret; @@ -862,7 +862,7 @@ static inline int gpio_port_set_clr_bits(struct device *port, static inline int gpio_pin_get_raw(struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; gpio_port_value_t value; int ret; @@ -900,7 +900,7 @@ static inline int gpio_pin_get_raw(struct device *port, gpio_pin_t pin) static inline int gpio_pin_get(struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; gpio_port_value_t value; int ret; @@ -935,7 +935,7 @@ static inline int gpio_pin_set_raw(struct device *port, gpio_pin_t pin, int value) { const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; int ret; (void)cfg; @@ -975,7 +975,7 @@ static inline int gpio_pin_set_raw(struct device *port, gpio_pin_t pin, static inline int gpio_pin_set(struct device *port, gpio_pin_t pin, int value) { const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; const struct gpio_driver_data *const data = (const struct gpio_driver_data *)port->driver_data; @@ -1003,7 +1003,7 @@ static inline int gpio_pin_set(struct device *port, gpio_pin_t pin, int value) static inline int gpio_pin_toggle(struct device *port, gpio_pin_t pin) { const struct gpio_driver_config *const cfg = - (const struct gpio_driver_config *)port->config_info; + (const struct gpio_driver_config *)port->config; (void)cfg; __ASSERT((cfg->port_pin_mask & (gpio_port_pins_t)BIT(pin)) != 0U, diff --git a/include/sys/device_mmio.h b/include/sys/device_mmio.h index 0c0bc02541a..db338999aac 100644 --- a/include/sys/device_mmio.h +++ b/include/sys/device_mmio.h @@ -176,12 +176,12 @@ struct z_device_mmio_rom { /** * @def DEVICE_MMIO_ROM * - * @brief Declare storage for MMIO data within a device's config_info struct + * @brief Declare storage for MMIO data within a device's config struct * * This gets accessed by DEVICE_MMIO_MAP() and DEVICE_MMIO_GET() macros. * * What gets stored here varies considerably by configuration. - * This must be the first member of the config_info struct. There must be + * This must be the first member of the config struct. There must be * a corresponding DEVICE_MMIO_RAM in driver_data. * * This storage is not used if the device is PCIe and may be omitted. @@ -193,7 +193,7 @@ struct z_device_mmio_rom { * * Example for a driver named "foo": * - * struct foo_config_info { + * struct foo_config { * DEVICE_MMIO_ROM; * int baz; * ... @@ -208,14 +208,14 @@ struct z_device_mmio_rom { * * Return a pointer to the ROM-based storage area for a device's MMIO * information. This macro will not work properly if the ROM storage - * was omitted from the config_info struct declaration, and should not + * was omitted from the config struct declaration, and should not * be used in this case. * * @param device device instance object * @retval struct device_mmio_rom * pointer to storage location */ #define DEVICE_MMIO_ROM_PTR(device) \ - ((struct z_device_mmio_rom *)((device)->config_info)) + ((struct z_device_mmio_rom *)((device)->config)) /** * @def DEVICE_MMIO_ROM_INIT(instance) @@ -223,11 +223,11 @@ struct z_device_mmio_rom { * @brief Initialize a DEVICE_MMIO_ROM member * * Initialize MMIO-related information within a specific instance of - * a device config_info struct, using information from DTS. + * a device config struct, using information from DTS. * * Example for an instance of a driver belonging to the "foo" subsystem: * - * struct foo_config_info my_config_info = { + * struct foo_config my_config = { * DEVICE_MMIO_ROM_INIT(instance), * .baz = 2; * ... @@ -272,7 +272,7 @@ struct z_device_mmio_rom { * @brief Obtain the MMIO address for a device * * For most microcontrollers MMIO addresses can be fixed values known at - * build time, and we can store this in device->config_info, residing in ROM. + * build time, and we can store this in device->config, residing in ROM. * * However, some devices can only know their MMIO addresses at runtime, * because they need to be memory-mapped into the address space, enumerated @@ -313,7 +313,7 @@ struct z_device_mmio_rom { * Depending on configuration, no memory may be reserved at all. * Multiple named regions may be declared. * - * There must be a corresponding DEVICE_MMIO_ROM in config_info if the + * There must be a corresponding DEVICE_MMIO_ROM in config if the * physical address is known at build time, but may be omitted if not (such * as with PCIe. * @@ -358,7 +358,7 @@ struct z_device_mmio_rom { /** * @def DEVICE_MMIO_NAMED_ROM(name) * - * @brief Declare storage for MMIO data within a device's config_info struct. + * @brief Declare storage for MMIO data within a device's config struct. * * This gets accessed by DEVICE_MMIO_NAMED_MAP() and * DEVICE_MMIO_NAMED_GET() macros. @@ -376,7 +376,7 @@ struct z_device_mmio_rom { * * Example for a driver named "foo": * - * struct foo_config_info { + * struct foo_config { * int bar; * DEVICE_MMIO_NAMED_ROM(courge); * DEVICE_MMIO_NAMED_ROM(grault); @@ -386,7 +386,7 @@ struct z_device_mmio_rom { * * @see DEVICE_MMIO_NAMED_ROM_INIT() * - * @param name Member name to store within config_info + * @param name Member name to store within config */ #define DEVICE_MMIO_NAMED_ROM(name) struct z_device_mmio_rom name @@ -397,11 +397,11 @@ struct z_device_mmio_rom { * information. * * This macro requires that the macro DEV_CFG is locally defined and returns - * a properly typed pointer to the particular config_info struct for this + * a properly typed pointer to the particular config struct for this * driver. * * @param device device instance object - * @param name Member name within config_info + * @param name Member name within config * @retval struct device_mmio_rom * pointer to storage location */ #define DEVICE_MMIO_NAMED_ROM_PTR(device, name) (&(DEV_CFG(device)->name)) @@ -412,12 +412,12 @@ struct z_device_mmio_rom { * @brief Initialize a named DEVICE_MMIO_NAMED_ROM member * * Initialize MMIO-related information within a specific instance of - * a device config_info struct, using information from DTS. + * a device config struct, using information from DTS. * * Example for an instance of a driver belonging to the "foo" subsystem * that will have two regions named 'courge' and 'grault': * - * struct foo_config_info my_config_info = { + * struct foo_config my_config = { * bar = 7; * DEVICE_MMIO_NAMED_ROM_INIT(courge, instance); * DEVICE_MMIO_NAMED_ROM_INIT(grault, instance); @@ -427,7 +427,7 @@ struct z_device_mmio_rom { * * @see DEVICE_MMIO_NAMED_ROM() * - * @param name Member name within config_info for the MMIO region + * @param name Member name within config for the MMIO region * @param instance DTS instance */ #define DEVICE_MMIO_NAMED_ROM_INIT(name, instance) \ @@ -450,7 +450,7 @@ struct z_device_mmio_rom { * * This macro requires that the macros DEV_DATA and DEV_CFG are locally * defined and return properly typed pointers to the particular dev_data - * and config_info structs for this driver. + * and config structs for this driver. * * The flags argument is currently used for caching mode, which should be * one of the DEVICE_CACHE_* macros. Unused bits are reserved for future @@ -483,7 +483,7 @@ struct z_device_mmio_rom { * * This macro requires that the macros DEV_DATA and DEV_CFG are locally * defined and return properly typed pointers to the particular dev_data - * and config_info structs for this driver. + * and config structs for this driver. * * @see DEVICE_MMIO_GET * @@ -528,7 +528,7 @@ struct z_device_mmio_rom { * @brief Declare top-level storage for MMIO information, global scope * * This is intended for drivers which do not use Zephyr's driver model - * of config_info/dev_data linked to a struct device. + * of config/dev_data linked to a struct device. * * Instead, this is a top-level declaration for the driver's C file. * The scope of this declaration is global and may be referenced by @@ -577,7 +577,7 @@ struct z_device_mmio_rom { * @brief Declare top-level storage for MMIO information, static scope * * This is intended for drivers which do not use Zephyr's driver model - * of config_info/dev_data linked to a struct device. + * of config/dev_data linked to a struct device. * * Instead, this is a top-level declaration for the driver's C file. * The scope of this declaration is static. diff --git a/subsys/disk/disk_access_usdhc.c b/subsys/disk/disk_access_usdhc.c index ecbeac79451..9e57b620493 100644 --- a/subsys/disk/disk_access_usdhc.c +++ b/subsys/disk/disk_access_usdhc.c @@ -2658,7 +2658,7 @@ static int usdhc_board_access_init(struct usdhc_priv *priv) static int usdhc_access_init(const struct device *dev) { - const struct usdhc_config *config = dev->config_info; + const struct usdhc_config *config = dev->config; struct usdhc_priv *priv = dev->driver_data; int ret; diff --git a/subsys/usb/class/audio/audio.c b/subsys/usb/class/audio/audio.c index 939765f313a..8d44f2cddeb 100644 --- a/subsys/usb/class/audio/audio.c +++ b/subsys/usb/class/audio/audio.c @@ -810,7 +810,7 @@ int usb_audio_send(const struct device *dev, struct net_buf *buffer, size_t len) { struct usb_audio_dev_data *audio_dev_data = dev->driver_data; - struct usb_cfg_data *cfg = (void *)dev->config_info; + struct usb_cfg_data *cfg = (void *)dev->config; /* EP ISO IN is always placed first in the endpoint table */ uint8_t ep = cfg->endpoint[0].ep_addr; @@ -900,7 +900,7 @@ void usb_audio_register(struct device *dev, const struct usb_audio_ops *ops) { struct usb_audio_dev_data *audio_dev_data = dev->driver_data; - const struct usb_cfg_data *cfg = dev->config_info; + const struct usb_cfg_data *cfg = dev->config; const struct std_if_descriptor *iface_descr = cfg->interface_descriptor; const struct cs_ac_if_descriptor *header = @@ -916,7 +916,7 @@ void usb_audio_register(struct device *dev, sys_slist_append(&usb_audio_data_devlist, &audio_dev_data->common.node); LOG_DBG("Device dev %p dev_data %p cfg %p added to devlist %p", - dev, audio_dev_data, dev->config_info, + dev, audio_dev_data, dev->config, &usb_audio_data_devlist); } diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c index 9de34b92321..9d495acae01 100644 --- a/subsys/usb/class/cdc_acm.c +++ b/subsys/usb/class/cdc_acm.c @@ -302,7 +302,7 @@ static void tx_work_handler(struct k_work *work) struct cdc_acm_dev_data_t *dev_data = CONTAINER_OF(work, struct cdc_acm_dev_data_t, tx_work); struct device *dev = dev_data->common.dev; - struct usb_cfg_data *cfg = (void *)dev->config_info; + struct usb_cfg_data *cfg = (void *)dev->config; uint8_t ep = cfg->endpoint[ACM_IN_EP_IDX].ep_addr; uint8_t *data; size_t len; @@ -414,7 +414,7 @@ static void cdc_acm_do_cb(struct cdc_acm_dev_data_t *dev_data, const uint8_t *param) { struct device *dev = dev_data->common.dev; - struct usb_cfg_data *cfg = (void *)dev->config_info; + struct usb_cfg_data *cfg = (void *)dev->config; /* Check the USB status and do needed action if required */ switch (status) { @@ -541,7 +541,7 @@ static int cdc_acm_init(struct device *dev) sys_slist_append(&cdc_acm_data_devlist, &dev_data->common.node); LOG_DBG("Device dev %p dev_data %p cfg %p added to devlist %p", - dev, dev_data, dev->config_info, &cdc_acm_data_devlist); + dev, dev_data, dev->config, &cdc_acm_data_devlist); k_sem_init(&poll_wait_sem, 0, UINT_MAX); k_work_init(&dev_data->cb_work, cdc_acm_irq_callback_work_handler); @@ -813,7 +813,7 @@ static void cdc_acm_baudrate_set(struct device *dev, uint32_t baudrate) static int cdc_acm_send_notification(struct device *dev, uint16_t serial_state) { struct cdc_acm_dev_data_t * const dev_data = DEV_DATA(dev); - struct usb_cfg_data * const cfg = (void *)dev->config_info; + struct usb_cfg_data * const cfg = (void *)dev->config; struct cdc_acm_notification notification; uint32_t cnt = 0U; diff --git a/subsys/usb/class/hid/core.c b/subsys/usb/class/hid/core.c index 01d4b87a27f..78544acddfc 100644 --- a/subsys/usb/class/hid/core.c +++ b/subsys/usb/class/hid/core.c @@ -518,7 +518,7 @@ static int hid_custom_handle_req(struct usb_setup_packet *setup, switch (value) { case HID_CLASS_DESCRIPTOR_HID: - cfg = common->dev->config_info; + cfg = common->dev->config; hid_desc = cfg->interface_descriptor; LOG_DBG("Return HID Descriptor"); @@ -646,7 +646,7 @@ static void hid_interface_config(struct usb_desc_header *head, int usb_hid_init(const struct device *dev) { - struct usb_cfg_data *cfg = (void *)dev->config_info; + struct usb_cfg_data *cfg = (void *)dev->config; struct hid_device_info *dev_data = dev->driver_data; LOG_DBG("Initializing HID Device: dev %p", dev); @@ -679,7 +679,7 @@ void usb_hid_register_device(struct device *dev, const uint8_t *desc, int hid_int_ep_write(const struct device *dev, const uint8_t *data, uint32_t data_len, uint32_t *bytes_ret) { - const struct usb_cfg_data *cfg = dev->config_info; + const struct usb_cfg_data *cfg = dev->config; return usb_write(cfg->endpoint[HID_INT_IN_EP_IDX].ep_addr, data, data_len, bytes_ret); @@ -689,7 +689,7 @@ int hid_int_ep_read(const struct device *dev, uint8_t *data, uint32_t max_data_l uint32_t *ret_bytes) { #ifdef CONFIG_ENABLE_HID_INT_OUT_EP - const struct usb_cfg_data *cfg = dev->config_info; + const struct usb_cfg_data *cfg = dev->config; return usb_read(cfg->endpoint[HID_INT_OUT_EP_IDX].ep_addr, data, max_data_len, ret_bytes); diff --git a/subsys/usb/usb_descriptor.c b/subsys/usb/usb_descriptor.c index 9d9e7ee468f..0772fba5ecd 100644 --- a/subsys/usb/usb_descriptor.c +++ b/subsys/usb/usb_descriptor.c @@ -485,7 +485,7 @@ struct usb_dev_data *usb_get_dev_data_by_cfg(sys_slist_t *list, SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { struct device *dev = dev_data->dev; - const struct usb_cfg_data *cfg_cur = dev->config_info; + const struct usb_cfg_data *cfg_cur = dev->config; if (cfg_cur == cfg) { return dev_data; @@ -504,7 +504,7 @@ struct usb_dev_data *usb_get_dev_data_by_iface(sys_slist_t *list, SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { struct device *dev = dev_data->dev; - const struct usb_cfg_data *cfg = dev->config_info; + const struct usb_cfg_data *cfg = dev->config; const struct usb_if_descriptor *if_desc = cfg->interface_descriptor; @@ -524,7 +524,7 @@ struct usb_dev_data *usb_get_dev_data_by_ep(sys_slist_t *list, uint8_t ep) SYS_SLIST_FOR_EACH_CONTAINER(list, dev_data, node) { struct device *dev = dev_data->dev; - const struct usb_cfg_data *cfg = dev->config_info; + const struct usb_cfg_data *cfg = dev->config; const struct usb_ep_cfg_data *ep_data = cfg->endpoint; for (uint8_t i = 0; i < cfg->num_endpoints; i++) { diff --git a/tests/drivers/sensor/src/dummy_sensor.c b/tests/drivers/sensor/src/dummy_sensor.c index 89a7dd6c298..642bed5fe33 100644 --- a/tests/drivers/sensor/src/dummy_sensor.c +++ b/tests/drivers/sensor/src/dummy_sensor.c @@ -74,7 +74,7 @@ static int dummy_init_interrupt(struct device *dev) static int dummy_sensor_init(struct device *dev) { struct dummy_sensor_data *data = dev->driver_data; - const struct dummy_sensor_config *config = dev->config_info; + const struct dummy_sensor_config *config = dev->config; /* i2c should be null for dummy driver */ struct device *i2c = device_get_binding(config->i2c_name); diff --git a/tests/kernel/device/src/mmio.c b/tests/kernel/device/src/mmio.c index 7bb581cbcfc..b7a099c9d9c 100644 --- a/tests/kernel/device/src/mmio.c +++ b/tests/kernel/device/src/mmio.c @@ -119,7 +119,7 @@ const struct foo_mult_config_info foo12_config = { }; #define DEV_DATA(dev) ((struct foo_mult_dev_data *)((dev)->driver_data)) -#define DEV_CFG(dev) ((struct foo_mult_config_info *)((dev)->config_info)) +#define DEV_CFG(dev) ((struct foo_mult_config_info *)((dev)->config)) int foo_mult_init(struct device *device) { diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c index 539f2a4881c..2dcfc40258e 100644 --- a/tests/lib/devicetree/api/src/main.c +++ b/tests/lib/devicetree/api/src/main.c @@ -1306,7 +1306,7 @@ static inline struct test_gpio_data *to_data(struct device *dev) static inline const struct test_gpio_info *to_info(struct device *dev) { - return (const struct test_gpio_info *)dev->config_info; + return (const struct test_gpio_info *)dev->config; } static void test_devices(void)