diff --git a/doc/reference/drivers/index.rst b/doc/reference/drivers/index.rst index 1ef169ca804..02536d825af 100644 --- a/doc/reference/drivers/index.rst +++ b/doc/reference/drivers/index.rst @@ -523,7 +523,7 @@ For example: ((const struct my_driver_config *)((_dev)->config)) #define DEV_DATA(_dev) \ - ((struct my_driver_dev_data *)((_dev)->driver_data)) + ((struct my_driver_dev_data *)((_dev)->data)) const static struct my_driver_config my_driver_config_0 = { ... diff --git a/drivers/adc/adc_lmp90xxx.c b/drivers/adc/adc_lmp90xxx.c index abf315cb55f..8b9961b13b1 100644 --- a/drivers/adc/adc_lmp90xxx.c +++ b/drivers/adc/adc_lmp90xxx.c @@ -177,7 +177,7 @@ static int lmp90xxx_read_reg(struct device *dev, uint8_t addr, uint8_t *dptr, size_t len) { const struct lmp90xxx_config *config = dev->config; - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t ura = LMP90XXX_URA(addr); uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura }; uint8_t inst2 = LMP90XXX_INST2_R | LMP90XXX_LRA(addr); @@ -251,7 +251,7 @@ static int lmp90xxx_write_reg(struct device *dev, uint8_t addr, uint8_t *dptr, size_t len) { const struct lmp90xxx_config *config = dev->config; - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t ura = LMP90XXX_URA(addr); uint8_t inst1_uab[2] = { LMP90XXX_INST1_WAB, ura }; uint8_t inst2 = LMP90XXX_INST2_WB | LMP90XXX_LRA(addr); @@ -380,7 +380,7 @@ static inline int lmp90xxx_acq_time_to_odr(uint16_t acq_time) static int lmp90xxx_adc_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t chx_inputcn = LMP90XXX_BURNOUT_EN(0); /* No burnout currents */ uint8_t chx_config = LMP90XXX_BUF_EN(0); /* No buffer */ uint8_t payload[2]; @@ -498,7 +498,7 @@ static int lmp90xxx_adc_start_read(struct device *dev, const struct adc_sequence *sequence) { const struct lmp90xxx_config *config = dev->config; - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err; if (sequence->resolution != config->resolution) { @@ -529,7 +529,7 @@ static int lmp90xxx_adc_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err; adc_context_lock(&data->ctx, async ? true : false, async); @@ -571,7 +571,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, uint8_t channel, int32_t *result) { const struct lmp90xxx_config *config = dev->config; - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t adc_done; uint8_t ch_scan; uint8_t buf[4]; /* ADC_DOUT + CRC */ @@ -649,7 +649,7 @@ static int lmp90xxx_adc_read_channel(struct device *dev, uint8_t channel, static void lmp90xxx_acquisition_thread(struct device *dev) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t bgcalcn = LMP90XXX_BGCALN(0x3); /* Default to BgCalMode3 */ int32_t result = 0; uint8_t channel; @@ -712,7 +712,7 @@ static void lmp90xxx_drdyb_callback(struct device *port, #ifdef CONFIG_ADC_LMP90XXX_GPIO int lmp90xxx_gpio_set_output(struct device *dev, uint8_t pin) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -737,7 +737,7 @@ int lmp90xxx_gpio_set_output(struct device *dev, uint8_t pin) int lmp90xxx_gpio_set_input(struct device *dev, uint8_t pin) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -762,7 +762,7 @@ int lmp90xxx_gpio_set_input(struct device *dev, uint8_t pin) int lmp90xxx_gpio_set_pin_value(struct device *dev, uint8_t pin, bool value) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -789,7 +789,7 @@ int lmp90xxx_gpio_set_pin_value(struct device *dev, uint8_t pin, bool value) int lmp90xxx_gpio_get_pin_value(struct device *dev, uint8_t pin, bool *value) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -811,7 +811,7 @@ int lmp90xxx_gpio_get_pin_value(struct device *dev, uint8_t pin, bool *value) int lmp90xxx_gpio_port_get_raw(struct device *dev, gpio_port_value_t *value) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t tmp; int err; @@ -829,7 +829,7 @@ int lmp90xxx_gpio_port_set_masked_raw(struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -850,7 +850,7 @@ int lmp90xxx_gpio_port_set_masked_raw(struct device *dev, int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -872,7 +872,7 @@ int lmp90xxx_gpio_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev, gpio_port_pins_t pins) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; int err = 0; uint8_t tmp; @@ -893,7 +893,7 @@ int lmp90xxx_gpio_port_clear_bits_raw(struct device *dev, int lmp90xxx_gpio_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) { - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; uint8_t tmp; int err; @@ -915,7 +915,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; - struct lmp90xxx_data *data = dev->driver_data; + struct lmp90xxx_data *data = dev->data; struct device *drdyb_dev; k_tid_t tid; int err; diff --git a/drivers/adc/adc_mchp_xec.c b/drivers/adc/adc_mchp_xec.c index e6492ec2486..11e73ea53c3 100644 --- a/drivers/adc/adc_mchp_xec.c +++ b/drivers/adc/adc_mchp_xec.c @@ -150,7 +150,7 @@ static int adc_xec_start_read(struct device *dev, const struct adc_sequence *sequence) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; uint32_t reg; if (sequence->channels & ~BIT_MASK(MCHP_ADC_MAX_CHAN)) { @@ -194,7 +194,7 @@ static int adc_xec_start_read(struct device *dev, static int adc_xec_read(struct device *dev, const struct adc_sequence *sequence) { - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; int error; adc_context_lock(&data->ctx, false, NULL); @@ -209,7 +209,7 @@ static int adc_xec_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; int error; adc_context_lock(&data->ctx, true, async); @@ -223,7 +223,7 @@ static int adc_xec_read_async(struct device *dev, static void xec_adc_get_sample(struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; uint32_t idx; uint32_t channels = adc_regs->status_reg; uint32_t ch_status = channels; @@ -254,7 +254,7 @@ static void xec_adc_get_sample(struct device *dev) static void adc_xec_isr(struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; uint32_t reg; /* Clear START_SINGLE bit and clear SINGLE_DONE_STATUS */ @@ -285,7 +285,7 @@ struct adc_driver_api adc_xec_api = { static int adc_xec_init(struct device *dev) { struct adc_xec_regs *adc_regs = ADC_XEC_REG_BASE; - struct adc_xec_data *data = dev->driver_data; + struct adc_xec_data *data = dev->data; adc_regs->control_reg = XEC_ADC_CTRL_ACTIVATE | XEC_ADC_CTRL_POWER_SAVER_DIS diff --git a/drivers/adc/adc_mcp320x.c b/drivers/adc/adc_mcp320x.c index a7faa42cc25..7c13499364a 100644 --- a/drivers/adc/adc_mcp320x.c +++ b/drivers/adc/adc_mcp320x.c @@ -53,7 +53,7 @@ static int mcp320x_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) { const struct mcp320x_config *config = dev->config; - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; if (channel_cfg->gain != ADC_GAIN_1) { LOG_ERR("unsupported channel gain '%d'", channel_cfg->gain); @@ -113,7 +113,7 @@ static int mcp320x_start_read(struct device *dev, const struct adc_sequence *sequence) { const struct mcp320x_config *config = dev->config; - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; int err; if (sequence->resolution != MCP320X_RESOLUTION) { @@ -143,7 +143,7 @@ static int mcp320x_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; int err; adc_context_lock(&data->ctx, async ? true : false, async); @@ -182,7 +182,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; - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; uint8_t tx_bytes[2]; uint8_t rx_bytes[2]; int err; @@ -239,7 +239,7 @@ static int mcp320x_read_channel(struct device *dev, uint8_t channel, uint16_t *r static void mcp320x_acquisition_thread(struct device *dev) { - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; uint16_t result = 0; uint8_t channel; int err; @@ -274,7 +274,7 @@ static void mcp320x_acquisition_thread(struct device *dev) static int mcp320x_init(struct device *dev) { const struct mcp320x_config *config = dev->config; - struct mcp320x_data *data = dev->driver_data; + struct mcp320x_data *data = dev->data; k_sem_init(&data->sem, 0, 1); data->spi_dev = device_get_binding(config->spi_dev_name); diff --git a/drivers/adc/adc_mcux_adc12.c b/drivers/adc/adc_mcux_adc12.c index 6a086c54e99..78a93897b97 100644 --- a/drivers/adc/adc_mcux_adc12.c +++ b/drivers/adc/adc_mcux_adc12.c @@ -74,7 +74,7 @@ static int mcux_adc12_start_read(struct device *dev, const struct adc_sequence *sequence) { const struct mcux_adc12_config *config = dev->config; - struct mcux_adc12_data *data = dev->driver_data; + struct mcux_adc12_data *data = dev->data; adc12_hardware_average_mode_t mode; adc12_resolution_t resolution; ADC_Type *base = config->base; @@ -134,7 +134,7 @@ static int mcux_adc12_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct mcux_adc12_data *data = dev->driver_data; + struct mcux_adc12_data *data = dev->data; int error; adc_context_lock(&data->ctx, async ? true : false, async); @@ -153,7 +153,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; - struct mcux_adc12_data *data = dev->driver_data; + struct mcux_adc12_data *data = dev->data; adc12_channel_config_t channel_config; uint32_t channel_group = 0U; @@ -192,7 +192,7 @@ static void mcux_adc12_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_adc12_config *config = dev->config; - struct mcux_adc12_data *data = dev->driver_data; + struct mcux_adc12_data *data = dev->data; ADC_Type *base = config->base; uint32_t channel_group = 0U; uint16_t result; @@ -214,7 +214,7 @@ static void mcux_adc12_isr(void *arg) static int mcux_adc12_init(struct device *dev) { const struct mcux_adc12_config *config = dev->config; - struct mcux_adc12_data *data = dev->driver_data; + struct mcux_adc12_data *data = dev->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 2a7536df891..9012da579f8 100644 --- a/drivers/adc/adc_mcux_adc16.c +++ b/drivers/adc/adc_mcux_adc16.c @@ -67,7 +67,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; - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->data; adc16_hardware_average_mode_t mode; adc16_resolution_t resolution; int error; @@ -134,7 +134,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence) static int mcux_adc16_read(struct device *dev, const struct adc_sequence *sequence) { - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->data; int error; adc_context_lock(&data->ctx, false, NULL); @@ -149,7 +149,7 @@ static int mcux_adc16_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->data; int error; adc_context_lock(&data->ctx, true, async); @@ -163,7 +163,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; - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->data; adc16_channel_config_t channel_config; uint32_t channel_group = 0U; @@ -206,7 +206,7 @@ static void mcux_adc16_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_adc16_config *config = dev->config; - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->data; ADC_Type *base = config->base; uint32_t channel_group = 0U; uint16_t result; @@ -228,7 +228,7 @@ static void mcux_adc16_isr(void *arg) static int mcux_adc16_init(struct device *dev) { const struct mcux_adc16_config *config = dev->config; - struct mcux_adc16_data *data = dev->driver_data; + struct mcux_adc16_data *data = dev->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 66ef63d1a17..f6783226a06 100644 --- a/drivers/adc/adc_sam0.c +++ b/drivers/adc/adc_sam0.c @@ -61,7 +61,7 @@ struct adc_sam0_cfg { #define DEV_CFG(dev) \ ((const struct adc_sam0_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct adc_sam0_data *)(dev)->driver_data) + ((struct adc_sam0_data *)(dev)->data) static void wait_synchronization(Adc *const adc) { diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c index cde2d2aa01a..6693a6a026f 100644 --- a/drivers/adc/adc_sam_afec.c +++ b/drivers/adc/adc_sam_afec.c @@ -66,7 +66,7 @@ struct adc_sam_cfg { ((const struct adc_sam_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct adc_sam_data *)(dev)->driver_data) + ((struct adc_sam_data *)(dev)->data) static int adc_sam_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c index 2a37b59c531..29c38f226e3 100644 --- a/drivers/adc/adc_stm32.c +++ b/drivers/adc/adc_stm32.c @@ -266,7 +266,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; - struct adc_stm32_data *data = dev->driver_data; + struct adc_stm32_data *data = dev->data; ADC_TypeDef *adc = (ADC_TypeDef *)config->base; uint8_t resolution; int err; @@ -388,7 +388,7 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, 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; + struct adc_stm32_data *data = (struct adc_stm32_data *)dev->data; const struct adc_stm32_cfg *config = (const struct adc_stm32_cfg *)dev->config; ADC_TypeDef *adc = config->base; @@ -403,7 +403,7 @@ static void adc_stm32_isr(void *arg) static int adc_stm32_read(struct device *dev, const struct adc_sequence *sequence) { - struct adc_stm32_data *data = dev->driver_data; + struct adc_stm32_data *data = dev->data; int error; adc_context_lock(&data->ctx, false, NULL); @@ -418,7 +418,7 @@ static int adc_stm32_read_async(struct device *dev, const struct adc_sequence *sequence, struct k_poll_signal *async) { - struct adc_stm32_data *data = dev->driver_data; + struct adc_stm32_data *data = dev->data; int error; adc_context_lock(&data->ctx, true, async); @@ -467,7 +467,7 @@ static int adc_stm32_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) { #if defined(CONFIG_SOC_SERIES_STM32F0X) || defined(CONFIG_SOC_SERIES_STM32L0X) - struct adc_stm32_data *data = dev->driver_data; + struct adc_stm32_data *data = dev->data; #endif int acq_time_index; @@ -544,7 +544,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; + struct adc_stm32_data *data = dev->data; const struct adc_stm32_cfg *config = dev->config; struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); diff --git a/drivers/audio/mpxxdtyy.h b/drivers/audio/mpxxdtyy.h index 1a00f95b15b..a096e216409 100644 --- a/drivers/audio/mpxxdtyy.h +++ b/drivers/audio/mpxxdtyy.h @@ -22,7 +22,7 @@ extern "C" { #define DEV_CFG(dev) \ ((const struct mpxxdtyy_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct mpxxdtyy_data *const)(dev)->driver_data) + ((struct mpxxdtyy_data *const)(dev)->data) struct mpxxdtyy_data { struct device *comm_master; diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c index f4c92ff0143..b2b5512e504 100644 --- a/drivers/audio/tlv320dac310x.c +++ b/drivers/audio/tlv320dac310x.c @@ -53,7 +53,7 @@ static struct codec_driver_data codec_device_data; #define DEV_CFG(dev) \ ((struct codec_driver_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct codec_driver_data *const)(dev)->driver_data) + ((struct codec_driver_data *const)(dev)->data) static void codec_write_reg(struct device *dev, struct reg_addr reg, uint8_t val); static void codec_read_reg(struct device *dev, struct reg_addr reg, uint8_t *val); diff --git a/drivers/can/can_common.c b/drivers/can/can_common.c index 0e9746d650d..556a278e334 100644 --- a/drivers/can/can_common.c +++ b/drivers/can/can_common.c @@ -42,7 +42,7 @@ static void can_msgq_put(struct zcan_frame *frame, void *arg) int z_impl_can_attach_msgq(struct device *dev, struct k_msgq *msg_q, const struct zcan_filter *filter) { - const struct can_driver_api *api = dev->driver_api; + const struct can_driver_api *api = dev->api; return api->attach_isr(dev, can_msgq_put, msg_q, filter); } @@ -133,7 +133,7 @@ int can_attach_workq(struct device *dev, struct k_work_q *work_q, can_rx_callback_t callback, void *callback_arg, const struct zcan_filter *filter) { - const struct can_driver_api *api = dev->driver_api; + const struct can_driver_api *api = dev->api; k_work_init(&work->work_item, can_work_handler); work->work_queue = work_q; diff --git a/drivers/can/can_loopback.c b/drivers/can/can_loopback.c index 941ef598c1b..cfde6ada487 100644 --- a/drivers/can/can_loopback.c +++ b/drivers/can/can_loopback.c @@ -288,7 +288,7 @@ DEVICE_AND_API_INIT(can_loopback_1, CONFIG_CAN_LOOPBACK_DEV_NAME, static int socket_can_init_1(struct device *dev) { struct device *can_dev = DEVICE_GET(can_loopback_1); - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", dev, dev->name, can_dev, can_dev->name); diff --git a/drivers/can/can_loopback.h b/drivers/can/can_loopback.h index 89fb477eaa6..2e965b01b52 100644 --- a/drivers/can/can_loopback.h +++ b/drivers/can/can_loopback.h @@ -10,7 +10,7 @@ #include -#define DEV_DATA(dev) ((struct can_loopback_data *const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct can_loopback_data *const)(dev)->data) #define DEV_CFG(dev) \ ((const struct can_loopback_config *const)(dev)->config) diff --git a/drivers/can/can_mcp2515.h b/drivers/can/can_mcp2515.h index 0a6de103b3e..e6eb5a3420b 100644 --- a/drivers/can/can_mcp2515.h +++ b/drivers/can/can_mcp2515.h @@ -16,7 +16,7 @@ #define DEV_CFG(dev) \ ((const struct mcp2515_config *const)(dev)->config) -#define DEV_DATA(dev) ((struct mcp2515_data *const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct mcp2515_data *const)(dev)->data) struct mcp2515_tx_cb { struct k_sem sem; diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c index 715891b9689..adc9ea7096e 100644 --- a/drivers/can/can_mcux_flexcan.c +++ b/drivers/can/can_mcux_flexcan.c @@ -250,7 +250,7 @@ static int mcux_flexcan_send(struct device *dev, const struct zcan_frame *msg, can_tx_callback_t callback_isr, void *callback_arg) { const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; flexcan_mb_transfer_t xfer; status_t status; int alloc; @@ -300,7 +300,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr, const struct zcan_filter *filter) { const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; flexcan_mb_transfer_t xfer; status_t status; uint32_t mask; @@ -353,7 +353,7 @@ static int mcux_flexcan_attach_isr(struct device *dev, can_rx_callback_t isr, static void mcux_flexcan_register_state_change_isr(struct device *dev, can_state_change_isr_t isr) { - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; data->state_change_isr = isr; } @@ -415,7 +415,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; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; if (filter_id >= MCUX_FLEXCAN_MAX_RX) { LOG_ERR("Detach: Filter id >= MAX_RX (%d >= %d)", filter_id, @@ -444,7 +444,7 @@ static inline void mcux_flexcan_transfer_error_status(struct device *dev, uint32_t error) { const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; can_tx_callback_t function; int status = CAN_TX_OK; void *arg; @@ -520,7 +520,7 @@ static inline void mcux_flexcan_transfer_error_status(struct device *dev, static inline void mcux_flexcan_transfer_tx_idle(struct device *dev, uint32_t mb) { - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; can_tx_callback_t function; void *arg; int alloc; @@ -546,7 +546,7 @@ static inline void mcux_flexcan_transfer_rx_idle(struct device *dev, uint32_t mb) { const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; can_rx_callback_t function; flexcan_mb_transfer_t xfer; struct zcan_frame frame; @@ -611,7 +611,7 @@ static void mcux_flexcan_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; FLEXCAN_TransferHandleIRQ(config->base, &data->handle); } @@ -619,7 +619,7 @@ static void mcux_flexcan_isr(void *arg) static int mcux_flexcan_init(struct device *dev) { const struct mcux_flexcan_config *config = dev->config; - struct mcux_flexcan_data *data = dev->driver_data; + struct mcux_flexcan_data *data = dev->data; int err; int i; @@ -734,7 +734,7 @@ static void mcux_flexcan_config_func_0(struct device *dev) static int socket_can_init_0(struct device *dev) { struct device *can_dev = DEVICE_GET(can_mcux_flexcan_0); - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", dev, dev->name, can_dev, can_dev->name); diff --git a/drivers/can/can_net.c b/drivers/can/can_net.c index 3379d4eb196..ee3839714ea 100644 --- a/drivers/can/can_net.c +++ b/drivers/can/can_net.c @@ -91,7 +91,7 @@ static inline void can_set_lladdr(struct net_pkt *pkt, struct zcan_frame *frame) static int net_can_send(struct device *dev, const struct zcan_frame *frame, can_tx_callback_t cb, void *cb_arg, k_timeout_t timeout) { - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; NET_ASSERT(frame->id_type == CAN_EXTENDED_IDENTIFIER); return can_send(ctx->can_dev, frame, timeout, cb, cb_arg); @@ -173,7 +173,7 @@ static void mcast_cb(struct net_if *iface, const struct in6_addr *addr, bool is_joined) { struct device *dev = net_if_get_device(iface); - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; struct mcast_filter_mapping *filter_mapping; int filter_id; @@ -206,7 +206,7 @@ static void mcast_cb(struct net_if *iface, const struct in6_addr *addr, static void net_can_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; ctx->iface = iface; @@ -221,14 +221,14 @@ static int can_attach_filter(struct device *dev, can_rx_callback_t cb, void *cb_arg, const struct zcan_filter *filter) { - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; return can_attach_isr(ctx->can_dev, cb, cb_arg, filter); } static void can_detach_filter(struct device *dev, int filter_id) { - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; if (filter_id >= 0) { can_detach(ctx->can_dev, filter_id); @@ -314,7 +314,7 @@ static inline int can_attach_all_mcast_filter(struct net_can_context *ctx) static int can_enable(struct device *dev, bool enable) { - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; if (enable) { if (ctx->recv_filter_id == CAN_NET_FILTER_NOT_SET) { @@ -373,7 +373,7 @@ static struct net_can_api net_can_api_inst = { static int net_can_init(struct device *dev) { struct device *can_dev; - struct net_can_context *ctx = dev->driver_data; + struct net_can_context *ctx = dev->data; can_dev = device_get_binding(DT_CHOSEN_ZEPHYR_CAN_PRIMARY_LABEL); diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c index 06da8ac2fde..e7649a53d28 100644 --- a/drivers/can/can_stm32.c +++ b/drivers/can/can_stm32.c @@ -1106,7 +1106,7 @@ static void config_can_1_irq(CAN_TypeDef *can) static int socket_can_init_1(struct device *dev) { struct device *can_dev = DEVICE_GET(can_stm32_1); - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", dev, dev->name, can_dev, can_dev->name); @@ -1189,7 +1189,7 @@ static void config_can_2_irq(CAN_TypeDef *can) static int socket_can_init_2(struct device *dev) { struct device *can_dev = DEVICE_GET(can_stm32_2); - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; LOG_DBG("Init socket CAN device %p (%s) for dev %p (%s)", dev, dev->name, can_dev, can_dev->name); diff --git a/drivers/can/can_stm32.h b/drivers/can/can_stm32.h index 46852c2a5f8..9fa58c04741 100644 --- a/drivers/can/can_stm32.h +++ b/drivers/can/can_stm32.h @@ -10,7 +10,7 @@ #include -#define DEV_DATA(dev) ((struct can_stm32_data *const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct can_stm32_data *const)(dev)->data) #define DEV_CFG(dev) \ ((const struct can_stm32_config *const)(dev)->config) diff --git a/drivers/can/socket_can_generic.h b/drivers/can/socket_can_generic.h index 58fb3e6c3bb..46512d9e798 100644 --- a/drivers/can/socket_can_generic.h +++ b/drivers/can/socket_can_generic.h @@ -36,7 +36,7 @@ struct socket_can_context { static inline void socket_can_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; socket_context->iface = iface; @@ -55,7 +55,7 @@ static inline void tx_irq_callback(uint32_t error_flags, void *arg) /* This is called by net_if.c when packet is about to be sent */ static inline int socket_can_send(struct device *dev, struct net_pkt *pkt) { - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; int ret; if (net_pkt_family(pkt) != AF_CAN) { @@ -79,7 +79,7 @@ static inline int socket_can_setsockopt(struct device *dev, void *obj, int level, int optname, const void *optval, socklen_t optlen) { - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; struct net_context *ctx = obj; int ret; @@ -104,7 +104,7 @@ static inline int socket_can_setsockopt(struct device *dev, void *obj, static inline void socket_can_close(struct device *dev, int filter_id) { - struct socket_can_context *socket_context = dev->driver_data; + struct socket_can_context *socket_context = dev->data; can_detach(socket_context->can_dev, filter_id); } diff --git a/drivers/clock_control/clock_control_lpc11u6x.c b/drivers/clock_control/clock_control_lpc11u6x.c index 0d43e8b7721..15f0a3ef6c8 100644 --- a/drivers/clock_control/clock_control_lpc11u6x.c +++ b/drivers/clock_control/clock_control_lpc11u6x.c @@ -18,7 +18,7 @@ ((dev)->config)) #define DEV_DATA(dev) ((struct lpc11u6x_syscon_data *) \ - ((dev)->driver_data)) + ((dev)->data)) static void syscon_power_up(struct lpc11u6x_syscon_regs *syscon, uint32_t bit, bool enable) diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c index a18904cb9ff..25140a18cd8 100644 --- a/drivers/clock_control/nrf_power_clock.c +++ b/drivers/clock_control/nrf_power_clock.c @@ -109,7 +109,7 @@ static void clock_irqs_enable(void) static struct nrf_clock_control_sub_data *get_sub_data(struct device *dev, enum clock_control_nrf_type type) { - struct nrf_clock_control_data *data = dev->driver_data; + struct nrf_clock_control_data *data = dev->data; return &data->subsys[type]; } @@ -127,7 +127,7 @@ static const struct nrf_clock_control_sub_config *get_sub_config( static struct onoff_manager *get_onoff_manager(struct device *dev, enum clock_control_nrf_type type) { - struct nrf_clock_control_data *data = dev->driver_data; + struct nrf_clock_control_data *data = dev->data; return &data->mgr[type]; } @@ -263,8 +263,7 @@ static void hfclk_stop(void) static uint32_t *get_hf_flags(void) { - struct nrf_clock_control_data *data = - DEVICE_GET(clock_nrf)->driver_data; + struct nrf_clock_control_data *data = DEVICE_GET(clock_nrf)->data; return &data->subsys[CLOCK_CONTROL_NRF_TYPE_HFCLK].flags; } @@ -412,8 +411,7 @@ static int api_blocking_start(struct device *dev, clock_control_subsys_t subsys) static clock_control_subsys_t get_subsys(struct onoff_manager *mgr) { - struct nrf_clock_control_data *data = - DEVICE_GET(clock_nrf)->driver_data; + struct nrf_clock_control_data *data = DEVICE_GET(clock_nrf)->data; size_t offset = (size_t)(mgr - data->mgr); return (clock_control_subsys_t)offset; @@ -525,7 +523,7 @@ static int clk_init(struct device *dev) nrf_clock_lf_src_set(NRF_CLOCK, CLOCK_CONTROL_NRF_K32SRC); if (IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC_CALIBRATION)) { - struct nrf_clock_control_data *data = dev->driver_data; + struct nrf_clock_control_data *data = dev->data; z_nrf_clock_calibration_init(data->mgr); } diff --git a/drivers/console/ipm_console_receiver.c b/drivers/console/ipm_console_receiver.c index c09bb6f56cd..79856683dec 100644 --- a/drivers/console/ipm_console_receiver.c +++ b/drivers/console/ipm_console_receiver.c @@ -27,7 +27,7 @@ static void ipm_console_thread(void *arg1, void *arg2, void *arg3) int pos; d = (struct device *)arg1; - driver_data = d->driver_data; + driver_data = d->data; config_info = d->config; ARG_UNUSED(arg2); size32 = 0U; @@ -93,7 +93,7 @@ static void ipm_console_receive_callback(struct device *ipm_dev, void *context, ARG_UNUSED(data); d = context; - driver_data = d->driver_data; + driver_data = d->data; /* Should always be at least one free buffer slot */ ret = ring_buf_item_put(&driver_data->rb, 0, id, NULL, 0); @@ -119,7 +119,7 @@ int ipm_console_receiver_init(struct device *d) { const struct ipm_console_receiver_config_info *config_info = d->config; - struct ipm_console_receiver_runtime_data *driver_data = d->driver_data; + struct ipm_console_receiver_runtime_data *driver_data = d->data; struct device *ipm; ipm = device_get_binding(config_info->bind_to); diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c index 7cb1c3d34c4..cc5deff1aec 100644 --- a/drivers/console/uart_mux.c +++ b/drivers/console/uart_mux.c @@ -88,7 +88,7 @@ struct uart_mux_config { }; #define DEV_DATA(dev) \ - ((struct uart_mux_dev_data *)(dev)->driver_data) + ((struct uart_mux_dev_data *)(dev)->data) struct uart_mux_dev_data { sys_snode_t node; diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c index f5b0d4b897e..0b919f594f5 100644 --- a/drivers/counter/counter_gecko_rtcc.c +++ b/drivers/counter/counter_gecko_rtcc.c @@ -43,7 +43,7 @@ struct counter_gecko_data { #define DEV_CFG(dev) \ ((const struct counter_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct counter_gecko_data *const)(dev)->driver_data) + ((struct counter_gecko_data *const)(dev)->data) #ifdef CONFIG_SOC_GECKO_HAS_ERRATA_RTCC_E201 #define ERRATA_RTCC_E201_MESSAGE \ diff --git a/drivers/counter/counter_imx_epit.c b/drivers/counter/counter_imx_epit.c index ceaa9a38391..a1a3e9e14e8 100644 --- a/drivers/counter/counter_imx_epit.c +++ b/drivers/counter/counter_imx_epit.c @@ -33,7 +33,7 @@ static void imx_epit_isr(void *arg) { struct device *dev = (struct device *)arg; EPIT_Type *base = get_epit_config(dev)->base; - struct imx_epit_data *driver_data = dev->driver_data; + struct imx_epit_data *driver_data = dev->data; EPIT_ClearStatusFlag(base); @@ -100,7 +100,7 @@ static int imx_epit_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { EPIT_Type *base = get_epit_config(dev)->base; - struct imx_epit_data *driver_data = dev->driver_data; + struct imx_epit_data *driver_data = dev->data; /* Disable EPIT Output Compare interrupt for consistency */ EPIT_SetIntCmd(base, false); diff --git a/drivers/counter/counter_ll_stm32_rtc.c b/drivers/counter/counter_ll_stm32_rtc.c index 63a886c99b5..c947b8cd622 100644 --- a/drivers/counter/counter_ll_stm32_rtc.c +++ b/drivers/counter/counter_ll_stm32_rtc.c @@ -56,7 +56,7 @@ struct rtc_stm32_data { }; -#define DEV_DATA(dev) ((struct rtc_stm32_data *)(dev)->driver_data) +#define DEV_DATA(dev) ((struct rtc_stm32_data *)(dev)->data) #define DEV_CFG(dev) \ ((const struct rtc_stm32_config * const)(dev)->config) diff --git a/drivers/counter/counter_mchp_xec.c b/drivers/counter/counter_mchp_xec.c index 35e584857e1..caa381616df 100644 --- a/drivers/counter/counter_mchp_xec.c +++ b/drivers/counter/counter_mchp_xec.c @@ -55,7 +55,7 @@ struct counter_xec_data { _dev->config)) #define COUNTER_XEC_DATA(_dev) \ - ((struct counter_xec_data *)dev->driver_data) + ((struct counter_xec_data *)dev->data) static int counter_xec_start(struct device *dev) { diff --git a/drivers/counter/counter_mcux_gpt.c b/drivers/counter/counter_mcux_gpt.c index a0ea2318292..d05240cf8e8 100644 --- a/drivers/counter/counter_mcux_gpt.c +++ b/drivers/counter/counter_mcux_gpt.c @@ -56,7 +56,7 @@ 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; - struct mcux_gpt_data *data = dev->driver_data; + struct mcux_gpt_data *data = dev->data; uint32_t current = GPT_GetCurrentTimerCount(config->base); uint32_t ticks = alarm_cfg->ticks; @@ -87,7 +87,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; - struct mcux_gpt_data *data = dev->driver_data; + struct mcux_gpt_data *data = dev->data; if (chan_id != 0) { LOG_ERR("Invalid channel id"); @@ -104,7 +104,7 @@ void mcux_gpt_isr(void *p) { struct device *dev = p; const struct mcux_gpt_config *config = dev->config; - struct mcux_gpt_data *data = dev->driver_data; + struct mcux_gpt_data *data = dev->data; uint32_t current = GPT_GetCurrentTimerCount(config->base); uint32_t status; @@ -137,7 +137,7 @@ static int mcux_gpt_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { const struct mcux_gpt_config *config = dev->config; - struct mcux_gpt_data *data = dev->driver_data; + struct mcux_gpt_data *data = dev->data; if (cfg->ticks != config->info.max_top_value) { LOG_ERR("Wrap can only be set to 0x%x", diff --git a/drivers/counter/counter_mcux_lptmr.c b/drivers/counter/counter_mcux_lptmr.c index 481e18a1b37..d4c86b14304 100644 --- a/drivers/counter/counter_mcux_lptmr.c +++ b/drivers/counter/counter_mcux_lptmr.c @@ -61,7 +61,7 @@ static int mcux_lptmr_set_top_value(struct device *dev, const struct counter_top_cfg *cfg) { const struct mcux_lptmr_config *config = dev->config; - struct mcux_lptmr_data *data = dev->driver_data; + struct mcux_lptmr_data *data = dev->data; if (cfg->ticks == 0) { return -EINVAL; @@ -115,7 +115,7 @@ static void mcux_lptmr_isr(void *arg) { struct device *dev = arg; const struct mcux_lptmr_config *config = dev->config; - struct mcux_lptmr_data *data = dev->driver_data; + struct mcux_lptmr_data *data = dev->data; uint32_t flags; flags = LPTMR_GetStatusFlags(config->base); diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c index 7342eea0281..4692070bdaa 100644 --- a/drivers/counter/counter_mcux_rtc.c +++ b/drivers/counter/counter_mcux_rtc.c @@ -93,7 +93,7 @@ static int mcux_rtc_set_alarm(struct device *dev, uint8_t chan_id, 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; + struct mcux_rtc_data *data = dev->data; uint32_t ticks = alarm_cfg->ticks; uint32_t current = mcux_rtc_read(dev); @@ -129,7 +129,7 @@ static int mcux_rtc_set_alarm(struct device *dev, uint8_t chan_id, static int mcux_rtc_cancel_alarm(struct device *dev, uint8_t chan_id) { - struct mcux_rtc_data *data = dev->driver_data; + struct mcux_rtc_data *data = dev->data; if (chan_id != 0U) { LOG_ERR("Invalid channel id"); @@ -147,7 +147,7 @@ static int mcux_rtc_set_top_value(struct device *dev, 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; + struct mcux_rtc_data *data = dev->data; if (cfg->ticks != info->max_top_value) { LOG_ERR("Wrap can only be set to 0x%x.", info->max_top_value); @@ -195,7 +195,7 @@ static void mcux_rtc_isr(void *arg) 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; + struct mcux_rtc_data *data = dev->data; counter_alarm_callback_t cb; uint32_t current = mcux_rtc_read(dev); diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c index b5fe2711d0b..f9a6ae2503c 100644 --- a/drivers/counter/counter_nrfx_rtc.c +++ b/drivers/counter/counter_nrfx_rtc.c @@ -68,7 +68,7 @@ struct counter_nrfx_config { static inline struct counter_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct counter_nrfx_config *get_nrfx_config( diff --git a/drivers/counter/counter_nrfx_timer.c b/drivers/counter/counter_nrfx_timer.c index c57f6c6d037..78573e263b1 100644 --- a/drivers/counter/counter_nrfx_timer.c +++ b/drivers/counter/counter_nrfx_timer.c @@ -52,7 +52,7 @@ struct counter_timer_config { static inline struct counter_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct counter_nrfx_config *get_nrfx_config( diff --git a/drivers/counter/counter_sam0_tc32.c b/drivers/counter/counter_sam0_tc32.c index 116f9c78142..c3bc888e140 100644 --- a/drivers/counter/counter_sam0_tc32.c +++ b/drivers/counter/counter_sam0_tc32.c @@ -44,7 +44,7 @@ struct counter_sam0_tc32_config { #define DEV_CFG(dev) ((const struct counter_sam0_tc32_config *const) \ (dev)->config) #define DEV_DATA(dev) ((struct counter_sam0_tc32_data *const) \ - (dev)->driver_data) + (dev)->data) static void wait_synchronization(TcCount32 *regs) diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c index 904bc6bea38..6a18f820e95 100644 --- a/drivers/counter/maxim_ds3231.c +++ b/drivers/counter/maxim_ds3231.c @@ -148,7 +148,7 @@ static int sc_ctrl(struct device *dev, uint8_t set, uint8_t clear) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; struct register_map *rp = &data->registers; uint8_t ctrl = (rp->ctrl & ~clear) | set; @@ -172,7 +172,7 @@ int maxim_ds3231_ctrl_update(struct device *dev, uint8_t set_bits, uint8_t clear_bits) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; k_sem_take(&data->lock, K_FOREVER); @@ -200,7 +200,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; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; struct register_map *rp = &data->registers; uint8_t addr = offsetof(struct register_map, ctrl_stat); @@ -230,7 +230,7 @@ int maxim_ds3231_stat_update(struct device *dev, uint8_t set_bits, uint8_t clear_bits) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; k_sem_take(&data->lock, K_FOREVER); @@ -247,7 +247,7 @@ int maxim_ds3231_stat_update(struct device *dev, */ static void validate_isw_monitoring(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; const struct register_map *rp = &data->registers; uint8_t isw_mon_req = 0; @@ -448,7 +448,7 @@ static uint32_t decode_rtc(struct ds3231_data *data) static int update_registers(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; uint32_t syncclock; int rc; @@ -471,7 +471,7 @@ int maxim_ds3231_get_alarm(struct device *dev, uint8_t id, struct maxim_ds3231_alarm *cp) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; int rv = 0; uint8_t addr; @@ -517,7 +517,7 @@ out: static int cancel_alarm(struct device *dev, uint8_t id) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; data->alarm_handler[id] = NULL; data->alarm_user_data[id] = NULL; @@ -528,7 +528,7 @@ static int cancel_alarm(struct device *dev, static int ds3231_counter_cancel_alarm(struct device *dev, uint8_t id) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; int rv = 0; @@ -556,7 +556,7 @@ static int set_alarm(struct device *dev, uint8_t id, const struct maxim_ds3231_alarm *cp) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; uint8_t addr; uint8_t len; @@ -605,7 +605,7 @@ int maxim_ds3231_set_alarm(struct device *dev, uint8_t id, const struct maxim_ds3231_alarm *cp) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; k_sem_take(&data->lock, K_FOREVER); @@ -618,7 +618,7 @@ int maxim_ds3231_set_alarm(struct device *dev, int maxim_ds3231_check_alarms(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct register_map *rp = &data->registers; uint8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2); @@ -640,7 +640,7 @@ int maxim_ds3231_check_alarms(struct device *dev) static int check_handled_alarms(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct register_map *rp = &data->registers; uint8_t mask = (MAXIM_DS3231_ALARM1 | MAXIM_DS3231_ALARM2); @@ -750,7 +750,7 @@ static void sqw_worker(struct k_work *work) static int read_time(struct device *dev, time_t *time) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; uint8_t addr = 0; @@ -768,7 +768,7 @@ static int read_time(struct device *dev, static int ds3231_counter_get_value(struct device *dev, uint32_t *ticks) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; time_t time = 0; k_sem_take(&data->lock, K_FOREVER); @@ -787,7 +787,7 @@ static int ds3231_counter_get_value(struct device *dev, static void sync_finish(struct device *dev, int rc) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; struct sys_notify *notify = NULL; struct k_poll_signal *signal = NULL; @@ -818,7 +818,7 @@ static void sync_finish(struct device *dev, static void sync_prep_read(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; int rc = sc_ctrl(dev, 0U, MAXIM_DS3231_REG_CTRL_INTCN | MAXIM_DS3231_REG_CTRL_RS_Msk); @@ -832,7 +832,7 @@ static void sync_prep_read(struct device *dev) static void sync_finish_read(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; time_t time = 0; (void)read_time(dev, &time); @@ -853,7 +853,7 @@ static void sync_timer_handler(struct k_timer *tmr) static void sync_prep_write(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; uint32_t syncclock = maxim_ds3231_read_syncclock(dev); uint32_t offset = syncclock - data->new_sp.syncclock; uint32_t syncclock_Hz = maxim_ds3231_syncclock_frequency(dev); @@ -885,7 +885,7 @@ static void sync_prep_write(struct device *dev) static void sync_finish_write(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; time_t when = data->new_sp.rtc.tv_sec; struct tm tm; @@ -987,7 +987,7 @@ static void isw_gpio_callback(struct device *port, int z_impl_maxim_ds3231_get_syncpoint(struct device *dev, struct maxim_ds3231_syncpoint *syncpoint) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; int rv = 0; k_sem_take(&data->lock, K_FOREVER); @@ -1007,7 +1007,7 @@ int z_impl_maxim_ds3231_get_syncpoint(struct device *dev, int maxim_ds3231_synchronize(struct device *dev, struct sys_notify *notify) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; int rv = 0; if (notify == NULL) { @@ -1045,7 +1045,7 @@ out: int z_impl_maxim_ds3231_req_syncpoint(struct device *dev, struct k_poll_signal *sig) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; int rv = 0; if (data->isw == NULL) { @@ -1079,7 +1079,7 @@ int maxim_ds3231_set(struct device *dev, const struct maxim_ds3231_syncpoint *syncpoint, struct sys_notify *notify) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; int rv = 0; if ((syncpoint == NULL) @@ -1117,7 +1117,7 @@ out: static int ds3231_init(struct device *dev) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct ds3231_config *cfg = dev->config; struct device *i2c = device_get_binding(cfg->bus_name); int rc; @@ -1213,7 +1213,7 @@ int ds3231_counter_set_alarm(struct device *dev, uint8_t id, const struct counter_alarm_cfg *alarm_cfg) { - struct ds3231_data *data = dev->driver_data; + struct ds3231_data *data = dev->data; const struct register_map *rp = &data->registers; const struct ds3231_config *cfg = dev->config; time_t when; diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c index bf02554eb88..0b8c700d4e8 100644 --- a/drivers/counter/timer_dtmr_cmsdk_apb.c +++ b/drivers/counter/timer_dtmr_cmsdk_apb.c @@ -38,7 +38,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; - struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct dtmr_cmsdk_apb_dev_data *data = dev->data; /* Set the timer reload to count */ cfg->dtimer->timer1load = data->load; @@ -62,7 +62,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; - struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct dtmr_cmsdk_apb_dev_data *data = dev->data; *ticks = data->load - cfg->dtimer->timer1value; return 0; @@ -72,7 +72,7 @@ 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; - struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct dtmr_cmsdk_apb_dev_data *data = dev->data; data->top_callback = top_cfg->callback; data->top_user_data = top_cfg->user_data; @@ -104,7 +104,7 @@ static int dtmr_cmsdk_apb_set_top_value(struct device *dev, static uint32_t dtmr_cmsdk_apb_get_top_value(struct device *dev) { - struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct dtmr_cmsdk_apb_dev_data *data = dev->data; uint32_t ticks = data->load; @@ -130,7 +130,7 @@ static const struct counter_driver_api dtmr_cmsdk_apb_api = { static void dtmr_cmsdk_apb_isr(void *arg) { struct device *dev = (struct device *)arg; - struct dtmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct dtmr_cmsdk_apb_dev_data *data = dev->data; const struct dtmr_cmsdk_apb_cfg * const cfg = dev->config; cfg->dtimer->timer1intclr = DUALTIMER_INTCLR; diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c index fe9393bc873..192d71ecbbd 100644 --- a/drivers/counter/timer_tmr_cmsdk_apb.c +++ b/drivers/counter/timer_tmr_cmsdk_apb.c @@ -40,7 +40,7 @@ static int tmr_cmsdk_apb_start(struct device *dev) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config; - struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct tmr_cmsdk_apb_dev_data *data = dev->data; /* Set the timer reload to count */ cfg->timer->reload = data->load; @@ -64,7 +64,7 @@ static int tmr_cmsdk_apb_get_value(struct device *dev, uint32_t *ticks) { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config; - struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct tmr_cmsdk_apb_dev_data *data = dev->data; /* Get Counter Value */ *ticks = data->load - cfg->timer->value; @@ -76,7 +76,7 @@ static int tmr_cmsdk_apb_set_top_value(struct device *dev, { const struct tmr_cmsdk_apb_cfg * const cfg = dev->config; - struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct tmr_cmsdk_apb_dev_data *data = dev->data; /* Counter is always reset when top value is updated. */ if (top_cfg->flags & COUNTER_TOP_CFG_DONT_RESET) { @@ -103,7 +103,7 @@ static int tmr_cmsdk_apb_set_top_value(struct device *dev, static uint32_t tmr_cmsdk_apb_get_top_value(struct device *dev) { - struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct tmr_cmsdk_apb_dev_data *data = dev->data; uint32_t ticks = data->load; @@ -130,7 +130,7 @@ static const struct counter_driver_api tmr_cmsdk_apb_api = { static void tmr_cmsdk_apb_isr(void *arg) { struct device *dev = (struct device *)arg; - struct tmr_cmsdk_apb_dev_data *data = dev->driver_data; + struct tmr_cmsdk_apb_dev_data *data = dev->data; const struct tmr_cmsdk_apb_cfg * const cfg = dev->config; diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c index 20be1563692..5aadea1b34b 100644 --- a/drivers/crypto/crypto_ataes132a.c +++ b/drivers/crypto/crypto_ataes132a.c @@ -43,7 +43,7 @@ static int ataes132a_send_command(struct device *dev, uint8_t opcode, uint8_t *nresponse) { int retry_count = 0; - struct ataes132a_device_data *data = dev->driver_data; + struct ataes132a_device_data *data = dev->data; const struct ataes132a_device_config *cfg = dev->config; uint8_t count; uint8_t status; @@ -166,7 +166,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; + struct ataes132a_device_data *ataes132a = dev->data; const struct ataes132a_device_config *cfg = dev->config; uint32_t i2c_cfg; @@ -197,7 +197,7 @@ int ataes132a_aes_ccm_decrypt(struct device *dev, uint8_t *nonce_buf) { uint8_t command_mode = 0x0; - struct ataes132a_device_data *data = dev->driver_data; + struct ataes132a_device_data *data = dev->data; uint8_t out_len; uint8_t in_buf_len; uint8_t return_code; @@ -397,7 +397,7 @@ int ataes132a_aes_ccm_encrypt(struct device *dev, uint8_t *mac_count) { uint8_t command_mode = 0x0; - struct ataes132a_device_data *data = dev->driver_data; + struct ataes132a_device_data *data = dev->data; uint8_t buf_len; uint8_t out_len; uint8_t return_code; @@ -581,7 +581,7 @@ int ataes132a_aes_ecb_block(struct device *dev, uint8_t key_id, struct cipher_pkt *pkt) { - struct ataes132a_device_data *data = dev->driver_data; + struct ataes132a_device_data *data = dev->data; uint8_t buf_len; uint8_t out_len; uint8_t return_code; @@ -797,7 +797,7 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx, enum cipher_op op_type) { uint8_t key_id = *((uint8_t *)ctx->key.handle); - struct ataes132a_device_data *data = dev->driver_data; + struct ataes132a_device_data *data = dev->data; const struct ataes132a_device_config *cfg = dev->config; uint8_t config; diff --git a/drivers/crypto/crypto_ataes132a_priv.h b/drivers/crypto/crypto_ataes132a_priv.h index 49c35d1f372..00bbe827cab 100644 --- a/drivers/crypto/crypto_ataes132a_priv.h +++ b/drivers/crypto/crypto_ataes132a_priv.h @@ -140,7 +140,7 @@ static inline int burst_write_i2c(struct device *dev, uint16_t dev_addr, uint16_t start_addr, uint8_t *buf, uint8_t num_bytes) { - const struct i2c_driver_api *api = dev->driver_api; + const struct i2c_driver_api *api = dev->api; uint8_t addr_buffer[2]; struct i2c_msg msg[2]; @@ -162,7 +162,7 @@ static inline int burst_read_i2c(struct device *dev, uint16_t dev_addr, uint16_t start_addr, uint8_t *buf, uint8_t num_bytes) { - const struct i2c_driver_api *api = dev->driver_api; + const struct i2c_driver_api *api = dev->api; uint8_t addr_buffer[2]; struct i2c_msg msg[2]; diff --git a/drivers/crypto/crypto_stm32_priv.h b/drivers/crypto/crypto_stm32_priv.h index 97748072ad8..374cc33beda 100644 --- a/drivers/crypto/crypto_stm32_priv.h +++ b/drivers/crypto/crypto_stm32_priv.h @@ -31,7 +31,7 @@ struct crypto_stm32_session { ((const struct crypto_stm32_config *const)(dev)->config) #define CRYPTO_STM32_DATA(dev) \ - ((struct crypto_stm32_data *const)(dev)->driver_data) + ((struct crypto_stm32_data *const)(dev)->data) #define CRYPTO_STM32_SESSN(ctx) \ ((struct crypto_stm32_session *const)(ctx)->drv_sessn_state) diff --git a/drivers/dac/dac_mcux_dac.c b/drivers/dac/dac_mcux_dac.c index 64144cf32ba..9ae96f3f4bf 100644 --- a/drivers/dac/dac_mcux_dac.c +++ b/drivers/dac/dac_mcux_dac.c @@ -28,7 +28,7 @@ static int mcux_dac_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { const struct mcux_dac_config *config = dev->config; - struct mcux_dac_data *data = dev->driver_data; + struct mcux_dac_data *data = dev->data; dac_config_t dac_config; if (channel_cfg->channel_id != 0) { @@ -55,7 +55,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; - struct mcux_dac_data *data = dev->driver_data; + struct mcux_dac_data *data = dev->data; if (!data->configured) { LOG_ERR("channel not initialized"); diff --git a/drivers/dac/dac_mcux_dac32.c b/drivers/dac/dac_mcux_dac32.c index 758e9fbc8eb..c6b6fd9ebdb 100644 --- a/drivers/dac/dac_mcux_dac32.c +++ b/drivers/dac/dac_mcux_dac32.c @@ -29,7 +29,7 @@ static int mcux_dac32_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { const struct mcux_dac32_config *config = dev->config; - struct mcux_dac32_data *data = dev->driver_data; + struct mcux_dac32_data *data = dev->data; dac32_config_t dac32_config; if (channel_cfg->channel_id != 0) { @@ -60,7 +60,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; - struct mcux_dac32_data *data = dev->driver_data; + struct mcux_dac32_data *data = dev->data; if (!data->configured) { LOG_ERR("channel not initialized"); diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c index c88a21020b1..1ffe0259093 100644 --- a/drivers/dac/dac_stm32.c +++ b/drivers/dac/dac_stm32.c @@ -53,7 +53,7 @@ struct dac_stm32_data { static int dac_stm32_write_value(struct device *dev, uint8_t channel, uint32_t value) { - struct dac_stm32_data *data = dev->driver_data; + struct dac_stm32_data *data = dev->data; const struct dac_stm32_cfg *cfg = dev->config; if (channel - STM32_FIRST_CHANNEL >= data->channel_count || @@ -76,7 +76,7 @@ static int dac_stm32_write_value(struct device *dev, static int dac_stm32_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { - struct dac_stm32_data *data = dev->driver_data; + struct dac_stm32_data *data = dev->data; const struct dac_stm32_cfg *cfg = dev->config; if ((channel_cfg->channel_id - STM32_FIRST_CHANNEL >= diff --git a/drivers/display/display_dummy.c b/drivers/display/display_dummy.c index 1826bcb5b69..36a9499a644 100644 --- a/drivers/display/display_dummy.c +++ b/drivers/display/display_dummy.c @@ -17,7 +17,7 @@ static struct dummy_display_data dummy_display_data; static int dummy_display_init(struct device *dev) { struct dummy_display_data *disp_data = - (struct dummy_display_data *)dev->driver_data; + (struct dummy_display_data *)dev->data; disp_data->current_pixel_format = PIXEL_FORMAT_ARGB_8888; @@ -87,7 +87,7 @@ static void dummy_display_get_capabilities(const struct device *dev, struct display_capabilities *capabilities) { struct dummy_display_data *disp_data = - (struct dummy_display_data *)dev->driver_data; + (struct dummy_display_data *)dev->data; memset(capabilities, 0, sizeof(struct display_capabilities)); capabilities->x_resolution = CONFIG_DUMMY_DISPLAY_X_RES; @@ -105,7 +105,7 @@ static int dummy_display_set_pixel_format(const struct device *dev, const enum display_pixel_format pixel_format) { struct dummy_display_data *disp_data = - (struct dummy_display_data *)dev->driver_data; + (struct dummy_display_data *)dev->data; disp_data->current_pixel_format = pixel_format; return 0; diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c index 462d1165556..b5c93661393 100644 --- a/drivers/display/display_ili9340.c +++ b/drivers/display/display_ili9340.c @@ -49,7 +49,7 @@ static void ili9340_exit_sleep(struct ili9340_data *data) static int ili9340_init(struct device *dev) { - struct ili9340_data *data = (struct ili9340_data *)dev->driver_data; + struct ili9340_data *data = (struct ili9340_data *)dev->data; LOG_DBG("Initializing display driver"); @@ -137,7 +137,7 @@ static int ili9340_write(const struct device *dev, const uint16_t x, const struct display_buffer_descriptor *desc, const void *buf) { - struct ili9340_data *data = (struct ili9340_data *)dev->driver_data; + struct ili9340_data *data = (struct ili9340_data *)dev->data; const uint8_t *write_data_start = (uint8_t *) buf; struct spi_buf tx_buf; struct spi_buf_set tx_bufs; @@ -196,7 +196,7 @@ static void *ili9340_get_framebuffer(const struct device *dev) static int ili9340_display_blanking_off(const struct device *dev) { - struct ili9340_data *data = (struct ili9340_data *)dev->driver_data; + struct ili9340_data *data = (struct ili9340_data *)dev->data; LOG_DBG("Turning display blanking off"); ili9340_transmit(data, ILI9340_CMD_DISPLAY_ON, NULL, 0); @@ -205,7 +205,7 @@ static int ili9340_display_blanking_off(const struct device *dev) static int ili9340_display_blanking_on(const struct device *dev) { - struct ili9340_data *data = (struct ili9340_data *)dev->driver_data; + struct ili9340_data *data = (struct ili9340_data *)dev->data; LOG_DBG("Turning display blanking on"); ili9340_transmit(data, ILI9340_CMD_DISPLAY_OFF, NULL, 0); diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c index 4b62148dc14..4e23ae17008 100644 --- a/drivers/display/display_mcux_elcdif.c +++ b/drivers/display/display_mcux_elcdif.c @@ -45,7 +45,7 @@ static int mcux_elcdif_write(const struct device *dev, const uint16_t x, const void *buf) { const struct mcux_elcdif_config *config = dev->config; - struct mcux_elcdif_data *data = dev->driver_data; + struct mcux_elcdif_data *data = dev->data; uint8_t write_idx = data->write_idx; uint8_t read_idx = !write_idx; @@ -168,7 +168,7 @@ static void mcux_elcdif_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_elcdif_config *config = dev->config; - struct mcux_elcdif_data *data = dev->driver_data; + struct mcux_elcdif_data *data = dev->data; uint32_t status; status = ELCDIF_GetInterruptStatus(config->base); @@ -180,7 +180,7 @@ static void mcux_elcdif_isr(void *arg) static int mcux_elcdif_init(struct device *dev) { const struct mcux_elcdif_config *config = dev->config; - struct mcux_elcdif_data *data = dev->driver_data; + struct mcux_elcdif_data *data = dev->data; int i; elcdif_rgb_mode_config_t rgb_mode = config->rgb_mode; diff --git a/drivers/display/display_sdl.c b/drivers/display/display_sdl.c index a4b9a4ef5a2..d979bbbab70 100644 --- a/drivers/display/display_sdl.c +++ b/drivers/display/display_sdl.c @@ -29,7 +29,7 @@ static struct sdl_display_data sdl_display_data; static int sdl_display_init(struct device *dev) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; LOG_DBG("Initializing display driver"); memset(disp_data, 0, sizeof(struct sdl_display_data)); @@ -219,7 +219,7 @@ static int sdl_display_write(const struct device *dev, const uint16_t x, SDL_Rect rect; struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; LOG_DBG("Writing %dx%d (w,h) bitmap @ %dx%d (x,y)", desc->width, desc->height, x, y); @@ -278,7 +278,7 @@ static int sdl_display_read(const struct device *dev, const uint16_t x, void *buf) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; SDL_Rect rect; rect.x = x; @@ -305,7 +305,7 @@ static void *sdl_display_get_framebuffer(const struct device *dev) static int sdl_display_blanking_off(const struct device *dev) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; LOG_DBG("Turning display blacking off"); @@ -321,7 +321,7 @@ static int sdl_display_blanking_off(const struct device *dev) static int sdl_display_blanking_on(const struct device *dev) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; LOG_DBG("Turning display blanking on"); @@ -348,7 +348,7 @@ static void sdl_display_get_capabilities( const struct device *dev, struct display_capabilities *capabilities) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; memset(capabilities, 0, sizeof(struct display_capabilities)); capabilities->x_resolution = CONFIG_SDL_DISPLAY_X_RES; @@ -368,7 +368,7 @@ static int sdl_display_set_pixel_format(const struct device *dev, const enum display_pixel_format pixel_format) { struct sdl_display_data *disp_data = - (struct sdl_display_data *)dev->driver_data; + (struct sdl_display_data *)dev->data; switch (pixel_format) { case PIXEL_FORMAT_ARGB_8888: diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c index 4f0d7af2bfa..c6feb0db5ae 100644 --- a/drivers/display/display_st7789v.c +++ b/drivers/display/display_st7789v.c @@ -115,7 +115,7 @@ static void st7789v_reset_display(struct st7789v_data *data) static int st7789v_blanking_on(const struct device *dev) { - struct st7789v_data *driver = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *driver = (struct st7789v_data *)dev->data; st7789v_transmit(driver, ST7789V_CMD_DISP_OFF, NULL, 0); return 0; @@ -123,7 +123,7 @@ static int st7789v_blanking_on(const struct device *dev) static int st7789v_blanking_off(const struct device *dev) { - struct st7789v_data *driver = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *driver = (struct st7789v_data *)dev->data; st7789v_transmit(driver, ST7789V_CMD_DISP_ON, NULL, 0); return 0; @@ -161,7 +161,7 @@ static int st7789v_write(const struct device *dev, const struct display_buffer_descriptor *desc, const void *buf) { - struct st7789v_data *data = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *data = (struct st7789v_data *)dev->data; const uint8_t *write_data_start = (uint8_t *) buf; struct spi_buf tx_buf; struct spi_buf_set tx_bufs; @@ -223,7 +223,7 @@ static int st7789v_set_contrast(const struct device *dev, static void st7789v_get_capabilities(const struct device *dev, struct display_capabilities *capabilities) { - struct st7789v_data *data = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *data = (struct st7789v_data *)dev->data; memset(capabilities, 0, sizeof(struct display_capabilities)); capabilities->x_resolution = data->width; @@ -336,7 +336,7 @@ static void st7789v_lcd_init(struct st7789v_data *p_st7789v) static int st7789v_init(struct device *dev) { - struct st7789v_data *data = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *data = (struct st7789v_data *)dev->data; data->spi_dev = device_get_binding(DT_INST_BUS_LABEL(0)); if (data->spi_dev == NULL) { @@ -412,7 +412,7 @@ static int st7789v_pm_control(struct device *dev, uint32_t ctrl_command, void *context, device_pm_cb cb, void *arg) { int ret = 0; - struct st7789v_data *data = (struct st7789v_data *)dev->driver_data; + struct st7789v_data *data = (struct st7789v_data *)dev->data; switch (ctrl_command) { case DEVICE_PM_SET_POWER_STATE: diff --git a/drivers/display/gd7965.c b/drivers/display/gd7965.c index cf914147bf0..925e638ae90 100644 --- a/drivers/display/gd7965.c +++ b/drivers/display/gd7965.c @@ -112,7 +112,7 @@ static inline void gd7965_busy_wait(struct gd7965_data *driver) static int gd7965_update_display(const struct device *dev) { - struct gd7965_data *driver = dev->driver_data; + struct gd7965_data *driver = dev->data; LOG_DBG("Trigger update sequence"); if (gd7965_write_cmd(driver, GD7965_CMD_DRF, NULL, 0)) { @@ -126,7 +126,7 @@ static int gd7965_update_display(const struct device *dev) static int gd7965_blanking_off(const struct device *dev) { - struct gd7965_data *driver = dev->driver_data; + struct gd7965_data *driver = dev->data; if (blanking_on) { /* Update EPD pannel in normal mode */ @@ -152,7 +152,7 @@ static int gd7965_write(const struct device *dev, const uint16_t x, const uint16 const struct display_buffer_descriptor *desc, const void *buf) { - struct gd7965_data *driver = dev->driver_data; + struct gd7965_data *driver = dev->data; uint16_t x_end_idx = x + desc->width - 1; uint16_t y_end_idx = y + desc->height - 1; uint8_t ptl[GD7965_PTL_REG_LENGTH] = {0}; @@ -314,7 +314,7 @@ static int gd7965_clear_and_write_buffer(struct device *dev, static int gd7965_controller_init(struct device *dev) { - struct gd7965_data *driver = dev->driver_data; + struct gd7965_data *driver = dev->data; uint8_t tmp[GD7965_TRES_REG_LENGTH]; gpio_pin_set(driver->reset, GD7965_RESET_PIN, 1); @@ -392,7 +392,7 @@ static int gd7965_controller_init(struct device *dev) static int gd7965_init(struct device *dev) { - struct gd7965_data *driver = dev->driver_data; + struct gd7965_data *driver = dev->data; LOG_DBG(""); diff --git a/drivers/display/grove_lcd_rgb.c b/drivers/display/grove_lcd_rgb.c index e21277d0c9c..cc893de3769 100644 --- a/drivers/display/grove_lcd_rgb.c +++ b/drivers/display/grove_lcd_rgb.c @@ -106,7 +106,7 @@ void glcd_print(struct device *port, char *data, uint32_t size) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t buf[] = { GLCD_CMD_SET_CGRAM_ADDR, 0 }; int i; @@ -121,7 +121,7 @@ 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; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; unsigned char data[2]; @@ -142,7 +142,7 @@ void glcd_clear(struct device *port) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR }; i2c_write(dev->i2c, clear, sizeof(clear), rom->lcd_addr); @@ -155,7 +155,7 @@ void glcd_display_state_set(struct device *port, uint8_t opt) { const struct glcd_driver * const rom = (const struct glcd_driver *) port->config; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t data[] = { 0, 0 }; dev->display_switch = opt; @@ -170,7 +170,7 @@ void glcd_display_state_set(struct device *port, uint8_t opt) uint8_t glcd_display_state_get(struct device *port) { - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; return dev->display_switch; } @@ -179,7 +179,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; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t data[] = { 0, 0 }; dev->input_set = opt; @@ -193,7 +193,7 @@ void glcd_input_state_set(struct device *port, uint8_t opt) uint8_t glcd_input_state_get(struct device *port) { - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; return dev->input_set; } @@ -213,7 +213,7 @@ void glcd_color_select(struct device *port, uint8_t color) void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b) { - struct glcd_data * const dev = port->driver_data; + struct glcd_data * const dev = port->data; rgb_reg_set(dev->i2c, REGISTER_R, r); rgb_reg_set(dev->i2c, REGISTER_G, g); @@ -224,7 +224,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; - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t data[] = { 0, 0 }; dev->function = opt; @@ -239,7 +239,7 @@ void glcd_function_set(struct device *port, uint8_t opt) uint8_t glcd_function_get(struct device *port) { - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; return dev->function; } @@ -247,7 +247,7 @@ uint8_t glcd_function_get(struct device *port) int glcd_initialize(struct device *port) { - struct glcd_data *dev = port->driver_data; + struct glcd_data *dev = port->data; uint8_t cmd; LOG_DBG("initialize called"); diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c index b9b64175229..b42d7e5d8e0 100644 --- a/drivers/display/ssd1306.c +++ b/drivers/display/ssd1306.c @@ -79,7 +79,7 @@ static inline int ssd1306_reg_update(struct ssd1306_data *driver, uint8_t reg, static inline int ssd1306_set_panel_orientation(struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { SSD1306_CONTROL_BYTE_CMD, (SSD1306_PANEL_SEGMENT_REMAP ? @@ -97,7 +97,7 @@ static inline int ssd1306_set_panel_orientation(struct device *dev) static inline int ssd1306_set_timing_setting(struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_CLOCK_DIV_RATIO, @@ -119,7 +119,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev) static inline int ssd1306_set_hardware_config(struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_START_LINE, @@ -143,7 +143,7 @@ static inline int ssd1306_set_hardware_config(struct device *dev) static inline int ssd1306_set_charge_pump(const struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { #if defined(CONFIG_SSD1306_DEFAULT) SSD1306_CONTROL_BYTE_CMD, @@ -167,7 +167,7 @@ static inline int ssd1306_set_charge_pump(const struct device *dev) static int ssd1306_resume(const struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; /* set display on */ return ssd1306_reg_write(driver, SSD1306_CONTROL_LAST_BYTE_CMD, SSD1306_DISPLAY_ON); @@ -175,7 +175,7 @@ static int ssd1306_resume(const struct device *dev) static int ssd1306_suspend(const struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; /* set display on */ return ssd1306_reg_write(driver, SSD1306_CONTROL_LAST_BYTE_CMD, SSD1306_DISPLAY_OFF); @@ -185,7 +185,7 @@ static int ssd1306_write(const struct device *dev, const uint16_t x, const uint1 const struct display_buffer_descriptor *desc, const void *buf) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; size_t buf_len; if (desc->pitch < desc->width) { @@ -309,7 +309,7 @@ static int ssd1306_set_brightness(const struct device *dev, static int ssd1306_set_contrast(const struct device *dev, const uint8_t contrast) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_CONTRAST_CTRL, @@ -352,7 +352,7 @@ static int ssd1306_set_pixel_format(const struct device *dev, static int ssd1306_init_device(struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; uint8_t cmd_buf[] = { SSD1306_CONTROL_BYTE_CMD, @@ -412,7 +412,7 @@ static int ssd1306_init_device(struct device *dev) static int ssd1306_init(struct device *dev) { - struct ssd1306_data *driver = dev->driver_data; + struct ssd1306_data *driver = dev->data; LOG_DBG(""); diff --git a/drivers/display/ssd16xx.c b/drivers/display/ssd16xx.c index 979fe0707d6..676521e0a4e 100644 --- a/drivers/display/ssd16xx.c +++ b/drivers/display/ssd16xx.c @@ -210,7 +210,7 @@ static int ssd16xx_blanking_on(const struct device *dev) static int ssd16xx_update_display(const struct device *dev) { - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; int err; err = ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_CTRL2, @@ -228,7 +228,7 @@ static int ssd16xx_write(const struct device *dev, const uint16_t x, const struct display_buffer_descriptor *desc, const void *buf) { - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; int err; size_t buf_len; uint16_t x_start; @@ -387,7 +387,7 @@ static int ssd16xx_set_pixel_format(const struct device *dev, static int ssd16xx_clear_cntlr_mem(struct device *dev, uint8_t ram_cmd, bool update) { - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; uint8_t clear_page[EPD_PANEL_WIDTH]; uint16_t panel_h = EPD_PANEL_HEIGHT / EPD_PANEL_NUMOF_ROWS_PER_PAGE; @@ -435,7 +435,7 @@ static int ssd16xx_clear_cntlr_mem(struct device *dev, uint8_t ram_cmd, static inline int ssd16xx_load_ws_from_otp(struct device *dev) { - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; uint8_t tmp[2]; #if DT_INST_NODE_HAS_PROP(0, tssv) @@ -503,7 +503,7 @@ static inline int ssd16xx_load_ws_from_otp(struct device *dev) static int ssd16xx_load_ws_initial(struct device *dev) { #if DT_INST_NODE_HAS_PROP(0, lut_initial) - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; if (ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_LUT, ssd16xx_lut_initial, @@ -522,7 +522,7 @@ static int ssd16xx_load_ws_initial(struct device *dev) static int ssd16xx_load_ws_default(struct device *dev) { #if DT_INST_NODE_HAS_PROP(0, lut_default) - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; if (ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_LUT, ssd16xx_lut_default, @@ -541,7 +541,7 @@ static int ssd16xx_controller_init(struct device *dev) int err; uint8_t tmp[3]; size_t len; - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; LOG_DBG(""); @@ -643,7 +643,7 @@ static int ssd16xx_controller_init(struct device *dev) static int ssd16xx_init(struct device *dev) { - struct ssd16xx_data *driver = dev->driver_data; + struct ssd16xx_data *driver = dev->data; LOG_DBG(""); diff --git a/drivers/dma/dma_dw.c b/drivers/dma/dma_dw.c index e30bf782a06..a42278e3f09 100644 --- a/drivers/dma/dma_dw.c +++ b/drivers/dma/dma_dw.c @@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(dma_dw); #define DW_CFG_LOW_DEF 0x0 #define DEV_NAME(dev) ((dev)->name) -#define DEV_DATA(dev) ((struct dw_dma_dev_data *const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct dw_dma_dev_data *const)(dev)->data) #define DEV_CFG(dev) \ ((const struct dw_dma_dev_cfg *const)(dev)->config) diff --git a/drivers/dma/dma_mcux_edma.c b/drivers/dma/dma_mcux_edma.c index e28387ab16a..753278118c5 100644 --- a/drivers/dma/dma_mcux_edma.c +++ b/drivers/dma/dma_mcux_edma.c @@ -50,7 +50,7 @@ struct dma_mcux_edma_data { #define DEV_CFG(dev) \ ((const struct dma_mcux_edma_config *const)dev->config) -#define DEV_DATA(dev) ((struct dma_mcux_edma_data *)dev->driver_data) +#define DEV_DATA(dev) ((struct dma_mcux_edma_data *)dev->data) #define DEV_BASE(dev) ((DMA_Type *)DEV_CFG(dev)->base) #define DEV_DMAMUX_BASE(dev) ((DMAMUX_Type *)DEV_CFG(dev)->dmamux_base) diff --git a/drivers/dma/dma_pl330.c b/drivers/dma/dma_pl330.c index fcaf58d6fb3..ed5ec5fa5cf 100644 --- a/drivers/dma/dma_pl330.c +++ b/drivers/dma/dma_pl330.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(dma_pl330); ((const struct dma_pl330_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct dma_pl330_dev_data *const)(dev)->driver_data) + ((struct dma_pl330_dev_data *const)(dev)->data) #define BYTE_WIDTH(burst_size) (1 << (burst_size)) diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c index d94a31f1772..538b3fdd23a 100644 --- a/drivers/dma/dma_sam0.c +++ b/drivers/dma/dma_sam0.c @@ -27,7 +27,7 @@ struct dma_sam0_data { }; #define DEV_DATA(dev) \ - ((struct dma_sam0_data *const)(dev)->driver_data) + ((struct dma_sam0_data *const)(dev)->data) /* Handles DMA interrupts and dispatches to the individual channel */ diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c index c4d6b4fc12a..dec24e09bb0 100644 --- a/drivers/dma/dma_sam_xdmac.c +++ b/drivers/dma/dma_sam_xdmac.c @@ -49,7 +49,7 @@ struct sam_xdmac_dev_data { #define DEV_CFG(dev) \ ((const struct sam_xdmac_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct sam_xdmac_dev_data *const)(dev)->driver_data) + ((struct sam_xdmac_dev_data *const)(dev)->data) static void sam_xdmac_isr(void *arg) { diff --git a/drivers/dma/dma_stm32.c b/drivers/dma/dma_stm32.c index c6c58b40818..02237ed6144 100644 --- a/drivers/dma/dma_stm32.c +++ b/drivers/dma/dma_stm32.c @@ -57,7 +57,7 @@ static void dma_stm32_clear_stream_irq(struct device *dev, uint32_t id) static void dma_stm32_irq_handler(void *arg) { struct device *dev = arg; - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; const struct dma_stm32_config *config = dev->config; DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); struct dma_stm32_stream *stream; @@ -240,7 +240,7 @@ static int dma_stm32_configure(struct device *dev, uint32_t id, struct dma_config *config) #endif /* CONFIG_DMAMUX_STM32 */ { - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; const struct dma_stm32_config *dev_config = dev->config; @@ -479,7 +479,7 @@ static int dma_stm32_reload(struct device *dev, uint32_t id, { 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_data *data = dev->data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; /* give channel from index 0 */ @@ -526,7 +526,7 @@ static int dma_stm32_start(struct device *dev, uint32_t id) { 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_data *data = dev->data; /* give channel from index 0 */ id = id - STREAM_OFFSET; @@ -549,7 +549,7 @@ int dma_stm32_stop(struct device *dev, uint32_t id) static int dma_stm32_stop(struct device *dev, uint32_t id) #endif /* CONFIG_DMAMUX_STM32 */ { - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; struct dma_stm32_stream *stream = &data->streams[id - STREAM_OFFSET]; const struct dma_stm32_config *config = dev->config; @@ -582,7 +582,7 @@ struct k_mem_block block; static int dma_stm32_init(struct device *dev) { - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; const struct dma_stm32_config *config = dev->config; struct device *clk = device_get_binding(STM32_CLOCK_CONTROL_NAME); @@ -625,7 +625,7 @@ static int dma_stm32_get_status(struct device *dev, uint32_t id, { 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_data *data = dev->data; struct dma_stm32_stream *stream; /* give channel from index 0 */ @@ -694,7 +694,7 @@ DMA_INIT(0); static void dma_stm32_config_irq_0(struct device *dev) { - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; IRQ_INIT(0, 0); IRQ_INIT(0, 1); @@ -720,7 +720,7 @@ DMA_INIT(1); static void dma_stm32_config_irq_1(struct device *dev) { - struct dma_stm32_data *data = dev->driver_data; + struct dma_stm32_data *data = dev->data; IRQ_INIT(1, 0); IRQ_INIT(1, 1); diff --git a/drivers/dma/dmamux_stm32.c b/drivers/dma/dmamux_stm32.c index 3060f2bcbb4..35905920288 100644 --- a/drivers/dma/dmamux_stm32.c +++ b/drivers/dma/dmamux_stm32.c @@ -29,7 +29,7 @@ int dmamux_stm32_configure(struct device *dev, uint32_t id, struct dma_config *config) { /* device is the dmamux, id is the dmamux channel from 0 */ - struct dmamux_stm32_data *data = dev->driver_data; + struct dmamux_stm32_data *data = dev->data; const struct dmamux_stm32_config *dev_config = dev->config; /* @@ -78,7 +78,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; - struct dmamux_stm32_data *data = dev->driver_data; + struct dmamux_stm32_data *data = dev->data; /* check if this channel is valid */ if (id >= dev_config->channel_nb) { @@ -98,7 +98,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; - struct dmamux_stm32_data *data = dev->driver_data; + struct dmamux_stm32_data *data = dev->data; /* check if this channel is valid */ if (id >= dev_config->channel_nb) { @@ -119,7 +119,7 @@ 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; - struct dmamux_stm32_data *data = dev->driver_data; + struct dmamux_stm32_data *data = dev->data; /* check if this channel is valid */ if (id >= dev_config->channel_nb) { @@ -139,7 +139,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; + struct dmamux_stm32_data *data = dev->data; 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 488bb18076d..4d1a83adf89 100644 --- a/drivers/eeprom/eeprom_at2x.c +++ b/drivers/eeprom/eeprom_at2x.c @@ -66,7 +66,7 @@ struct eeprom_at2x_data { static inline int eeprom_at2x_write_protect(struct device *dev) { const struct eeprom_at2x_config *config = dev->config; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; if (!data->wp_gpio_dev) { return 0; @@ -78,7 +78,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; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; if (!data->wp_gpio_dev) { return 0; @@ -91,7 +91,7 @@ static int eeprom_at2x_read(struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; int err; if (!len) { @@ -140,7 +140,7 @@ 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; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; const uint8_t *pbuf = buf; int ret; @@ -203,7 +203,7 @@ static int eeprom_at24_read(struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; int64_t timeout; uint8_t addr[2]; int err; @@ -237,7 +237,7 @@ 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; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; int count = eeprom_at2x_limit_write_count(dev, offset, len); uint8_t block[config->addr_width / 8 + count]; int64_t timeout; @@ -282,7 +282,7 @@ static int eeprom_at24_write(struct device *dev, off_t offset, #ifdef CONFIG_EEPROM_AT25 static int eeprom_at25_rdsr(struct device *dev, uint8_t *status) { - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; uint8_t rdsr[2] = { EEPROM_AT25_RDSR, 0 }; uint8_t sr[2]; int err; @@ -343,7 +343,7 @@ static int eeprom_at25_read(struct device *dev, off_t offset, void *buf, size_t len) { const struct eeprom_at2x_config *config = dev->config; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; size_t cmd_len = 1 + config->addr_width / 8; uint8_t cmd[4] = { EEPROM_AT25_READ, 0, 0, 0 }; uint8_t *paddr; @@ -407,7 +407,7 @@ static int eeprom_at25_read(struct device *dev, off_t offset, void *buf, static int eeprom_at25_wren(struct device *dev) { - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; uint8_t cmd = EEPROM_AT25_WREN; const struct spi_buf tx_buf = { .buf = &cmd, @@ -425,7 +425,7 @@ 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; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; int count = eeprom_at2x_limit_write_count(dev, offset, len); uint8_t cmd[4] = { EEPROM_AT25_WRITE, 0, 0, 0 }; size_t cmd_len = 1 + config->addr_width / 8; @@ -485,7 +485,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; - struct eeprom_at2x_data *data = dev->driver_data; + struct eeprom_at2x_data *data = dev->data; int err; k_mutex_init(&data->lock); diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index 72d34e9e0d4..57d25811b21 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -45,7 +45,7 @@ DEVICE_DECLARE(entropy_cc13xx_cc26xx); static inline struct entropy_cc13xx_cc26xx_data * get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static void start_trng(struct entropy_cc13xx_cc26xx_data *data) diff --git a/drivers/entropy/entropy_nrf5.c b/drivers/entropy/entropy_nrf5.c index 30b5ba736a2..6d319f02f38 100644 --- a/drivers/entropy/entropy_nrf5.c +++ b/drivers/entropy/entropy_nrf5.c @@ -98,7 +98,7 @@ struct entropy_nrf5_dev_data { static struct entropy_nrf5_dev_data entropy_nrf5_data; #define DEV_DATA(dev) \ - ((struct entropy_nrf5_dev_data *)(dev)->driver_data) + ((struct entropy_nrf5_dev_data *)(dev)->data) static int random_byte_get(void) { diff --git a/drivers/entropy/entropy_stm32.c b/drivers/entropy/entropy_stm32.c index 6a49136f4ec..c12bc5dc2c2 100644 --- a/drivers/entropy/entropy_stm32.c +++ b/drivers/entropy/entropy_stm32.c @@ -29,7 +29,7 @@ struct entropy_stm32_rng_dev_data { }; #define DEV_DATA(dev) \ - ((struct entropy_stm32_rng_dev_data *)(dev)->driver_data) + ((struct entropy_stm32_rng_dev_data *)(dev)->data) #define DEV_CFG(dev) \ ((const struct entropy_stm32_rng_dev_cfg *)(dev)->config) diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c index a9df2465a6d..25b45e5ba67 100644 --- a/drivers/espi/espi_mchp_xec.c +++ b/drivers/espi/espi_mchp_xec.c @@ -476,7 +476,7 @@ static int espi_xec_receive_vwire(struct device *dev, static int espi_xec_send_oob(struct device *dev, struct espi_oob_packet *pckt) { int ret; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); uint8_t err_mask = MCHP_ESPI_OOB_TX_STS_IBERR | MCHP_ESPI_OOB_TX_STS_OVRUN | MCHP_ESPI_OOB_TX_STS_BADREQ; @@ -525,7 +525,7 @@ static int espi_xec_receive_oob(struct device *dev, int ret; uint8_t err_mask = MCHP_ESPI_OOB_RX_STS_IBERR | MCHP_ESPI_OOB_RX_STS_OVRUN; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); if (ESPI_OOB_REGS->TX_STS & err_mask) { return -EIO; @@ -559,7 +559,7 @@ static int espi_xec_flash_read(struct device *dev, struct espi_flash_packet *pckt) { int ret; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); uint32_t err_mask = MCHP_ESPI_FC_STS_IBERR | MCHP_ESPI_FC_STS_FAIL | MCHP_ESPI_FC_STS_OVFL | @@ -612,7 +612,7 @@ static int espi_xec_flash_write(struct device *dev, MCHP_ESPI_FC_STS_FAIL | MCHP_ESPI_FC_STS_BADREQ; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); LOG_DBG("%s", __func__); @@ -657,7 +657,7 @@ static int espi_xec_flash_write(struct device *dev, static int espi_xec_manage_callback(struct device *dev, struct espi_callback *callback, bool set) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); return espi_manage_callback(&data->callbacks, callback, set); } @@ -723,7 +723,7 @@ static void espi_bus_init(struct device *dev) static void espi_rst_isr(struct device *dev) { uint8_t rst_sts; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_RESET, 0, 0 }; rst_sts = ESPI_CAP_REGS->ERST_STS; @@ -857,7 +857,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); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); const struct espi_xec_config *config = dev->config; struct espi_event evt = { .evt_type = ESPI_BUS_EVENT_CHANNEL_READY, .evt_details = ESPI_CHANNEL_VWIRE, @@ -881,7 +881,7 @@ static void espi_vwire_chanel_isr(struct device *dev) static void espi_oob_down_isr(struct device *dev) { uint32_t status; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); status = ESPI_OOB_REGS->RX_STS; @@ -900,7 +900,7 @@ static void espi_oob_down_isr(struct device *dev) static void espi_oob_up_isr(struct device *dev) { uint32_t status; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { .evt_type = ESPI_BUS_EVENT_CHANNEL_READY, .evt_details = ESPI_CHANNEL_OOB, .evt_data = 0 @@ -933,7 +933,7 @@ static void espi_oob_up_isr(struct device *dev) static void espi_flash_isr(struct device *dev) { uint32_t status; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { .evt_type = ESPI_BUS_EVENT_CHANNEL_READY, .evt_details = ESPI_CHANNEL_FLASH, .evt_data = 0, @@ -967,7 +967,7 @@ static void espi_flash_isr(struct device *dev) static void vw_pltrst_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_EVENT_VWIRE_RECEIVED, ESPI_VWIRE_SIGNAL_PLTRST, 0 }; @@ -990,7 +990,7 @@ static void vw_pltrst_isr(struct device *dev) static void notify_system_state(struct device *dev, enum espi_vwire_signal signal) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_EVENT_VWIRE_RECEIVED, 0, 0 }; uint8_t status = 0; @@ -1013,7 +1013,7 @@ static void notify_host_warning(struct device *dev, if (!IS_ENABLED(CONFIG_ESPI_AUTOMATIC_WARNING_ACKNOWLEDGE)) { struct espi_xec_data *data = - (struct espi_xec_data *)(dev->driver_data); + (struct espi_xec_data *)(dev->data); struct espi_event evt = {ESPI_BUS_EVENT_VWIRE_RECEIVED, 0, 0 }; evt.evt_details = signal; @@ -1078,7 +1078,7 @@ static void vw_sus_slp_a_isr(struct device *dev) static void ibf_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, ESPI_PERIPHERAL_HOST_IO, ESPI_PERIPHERAL_NODATA }; @@ -1089,7 +1089,7 @@ static void ibf_isr(struct device *dev) #ifdef CONFIG_ESPI_PERIPHERAL_HOST_IO_PVT static void ibf_pvt_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { .evt_type = ESPI_BUS_PERIPHERAL_NOTIFICATION, .evt_details = ESPI_PERIPHERAL_HOST_IO_PVT, @@ -1102,7 +1102,7 @@ static void ibf_pvt_isr(struct device *dev) static void ibf_kbc_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); /* The high byte contains information from the host, * and the lower byte speficies if the host sent @@ -1123,7 +1123,7 @@ static void ibf_kbc_isr(struct device *dev) static void port80_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, (ESPI_PERIPHERAL_INDEX_0 << 16) | ESPI_PERIPHERAL_DEBUG_PORT80, ESPI_PERIPHERAL_NODATA @@ -1135,7 +1135,7 @@ static void port80_isr(struct device *dev) static void port81_isr(struct device *dev) { - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); struct espi_event evt = { ESPI_BUS_PERIPHERAL_NOTIFICATION, (ESPI_PERIPHERAL_INDEX_1 << 16) | ESPI_PERIPHERAL_DEBUG_PORT80, ESPI_PERIPHERAL_NODATA @@ -1291,7 +1291,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; - struct espi_xec_data *data = (struct espi_xec_data *)(dev->driver_data); + struct espi_xec_data *data = (struct espi_xec_data *)(dev->data); data->plt_rst_asserted = 0; diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c index 24fe215df36..691ce3ef104 100644 --- a/drivers/ethernet/eth_e1000.c +++ b/drivers/ethernet/eth_e1000.c @@ -110,7 +110,7 @@ static int e1000_tx(struct e1000_dev *dev, void *buf, size_t len) static int e1000_send(struct device *device, struct net_pkt *pkt) { - struct e1000_dev *dev = device->driver_data; + struct e1000_dev *dev = device->data; size_t len = net_pkt_get_len(pkt); if (net_pkt_read(pkt, dev->txb, len)) { @@ -162,7 +162,7 @@ out: static void e1000_isr(struct device *device) { - struct e1000_dev *dev = device->driver_data; + struct e1000_dev *dev = device->data; uint32_t icr = ior32(dev, ICR); /* Cleared upon read */ uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC; @@ -215,7 +215,7 @@ DEVICE_DECLARE(eth_e1000); int e1000_probe(struct device *device) { const pcie_bdf_t bdf = PCIE_BDF(0, 3, 0); - struct e1000_dev *dev = device->driver_data; + struct e1000_dev *dev = device->data; uint32_t ral, rah; uintptr_t phys_addr; size_t size; @@ -269,7 +269,7 @@ int e1000_probe(struct device *device) static void e1000_iface_init(struct net_if *iface) { - struct e1000_dev *dev = net_if_get_device(iface)->driver_data; + struct e1000_dev *dev = net_if_get_device(iface)->data; /* For VLAN, this value is only used to get the correct L2 driver. * The iface pointer in device context should contain the main diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c index 4bb515a5927..7f02e4cd579 100644 --- a/drivers/ethernet/eth_enc28j60.c +++ b/drivers/ethernet/eth_enc28j60.c @@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); static int eth_enc28j60_soft_reset(struct device *dev) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[2] = { ENC28J60_SPI_SC, 0xFF }; const struct spi_buf tx_buf = { .buf = buf, @@ -46,7 +46,7 @@ static int eth_enc28j60_soft_reset(struct device *dev) static void eth_enc28j60_set_bank(struct device *dev, uint16_t reg_addr) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[2]; const struct spi_buf tx_buf = { .buf = buf, @@ -81,7 +81,7 @@ static void eth_enc28j60_set_bank(struct device *dev, uint16_t reg_addr) static void eth_enc28j60_write_reg(struct device *dev, uint16_t reg_addr, uint8_t value) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[2]; const struct spi_buf tx_buf = { .buf = buf, @@ -101,7 +101,7 @@ static void eth_enc28j60_write_reg(struct device *dev, uint16_t reg_addr, static void eth_enc28j60_read_reg(struct device *dev, uint16_t reg_addr, uint8_t *value) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[3]; const struct spi_buf tx_buf = { .buf = buf, @@ -140,7 +140,7 @@ static void eth_enc28j60_read_reg(struct device *dev, uint16_t reg_addr, static void eth_enc28j60_set_eth_reg(struct device *dev, uint16_t reg_addr, uint8_t value) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[2]; const struct spi_buf tx_buf = { .buf = buf, @@ -161,7 +161,7 @@ static void eth_enc28j60_set_eth_reg(struct device *dev, uint16_t reg_addr, static void eth_enc28j60_clear_eth_reg(struct device *dev, uint16_t reg_addr, uint8_t value) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[2]; const struct spi_buf tx_buf = { .buf = buf, @@ -181,7 +181,7 @@ static void eth_enc28j60_clear_eth_reg(struct device *dev, uint16_t reg_addr, static void eth_enc28j60_write_mem(struct device *dev, uint8_t *data_buffer, uint16_t buf_len) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[1] = { ENC28J60_SPI_WBM }; struct spi_buf tx_buf[2] = { { @@ -223,7 +223,7 @@ static void eth_enc28j60_write_mem(struct device *dev, uint8_t *data_buffer, static void eth_enc28j60_read_mem(struct device *dev, uint8_t *data_buffer, uint16_t buf_len) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t buf[1] = { ENC28J60_SPI_RBM }; const struct spi_buf tx_buf = { .buf = buf, @@ -350,7 +350,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; - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint8_t data_macon; eth_enc28j60_set_bank(dev, ENC28J60_REG_MACON1); @@ -433,7 +433,7 @@ static struct net_if *get_iface(struct eth_enc28j60_runtime *ctx, static int eth_enc28j60_tx(struct device *dev, struct net_pkt *pkt) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint16_t tx_bufaddr = ENC28J60_TXSTART; uint16_t len = net_pkt_get_len(pkt); uint8_t per_packet_control; @@ -507,7 +507,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; - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint16_t lengthfr; uint8_t counter; @@ -659,7 +659,7 @@ done: static void eth_enc28j60_rx_thread(struct device *dev) { - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC; uint8_t int_stat; @@ -691,7 +691,7 @@ static enum ethernet_hw_caps eth_enc28j60_get_capabilities(struct device *dev) static void eth_enc28j60_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; net_if_set_link_addr(iface, context->mac_address, sizeof(context->mac_address), @@ -718,7 +718,7 @@ static const struct ethernet_api api_funcs = { static int eth_enc28j60_init(struct device *dev) { const struct eth_enc28j60_config *config = dev->config; - struct eth_enc28j60_runtime *context = dev->driver_data; + struct eth_enc28j60_runtime *context = dev->data; /* SPI config */ context->spi_cfg.operation = SPI_WORD_SET(8); diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c index 70a050d6f43..77307140394 100644 --- a/drivers/ethernet/eth_enc424j600.c +++ b/drivers/ethernet/eth_enc424j600.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(ethdrv, CONFIG_ETHERNET_LOG_LEVEL); static void enc424j600_write_sbc(struct device *dev, uint8_t cmd) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[2] = { cmd, 0xFF }; const struct spi_buf tx_buf = { .buf = buf, @@ -42,7 +42,7 @@ static void enc424j600_write_sbc(struct device *dev, uint8_t cmd) static void enc424j600_write_sfru(struct device *dev, uint8_t addr, uint16_t value) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[4]; const struct spi_buf tx_buf = { .buf = buf, @@ -64,7 +64,7 @@ static void enc424j600_write_sfru(struct device *dev, uint8_t addr, static void enc424j600_read_sfru(struct device *dev, uint8_t addr, uint16_t *value) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[4]; const struct spi_buf tx_buf = { .buf = buf, @@ -97,7 +97,7 @@ static void enc424j600_read_sfru(struct device *dev, uint8_t addr, static void enc424j600_modify_sfru(struct device *dev, uint8_t opcode, uint16_t addr, uint16_t value) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[4]; const struct spi_buf tx_buf = { .buf = buf, @@ -156,7 +156,7 @@ static void enc424j600_read_phy(struct device *dev, uint16_t addr, uint16_t *dat static void enc424j600_write_mem(struct device *dev, uint8_t opcode, uint8_t *data_buffer, uint16_t buf_len) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[1] = { opcode }; const struct spi_buf tx_buf[2] = { { @@ -182,7 +182,7 @@ static void enc424j600_write_mem(struct device *dev, uint8_t opcode, static void enc424j600_read_mem(struct device *dev, uint8_t opcode, uint8_t *data_buffer, uint16_t buf_len) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint8_t buf[1] = { opcode }; const struct spi_buf tx_buf = { .buf = buf, @@ -304,7 +304,7 @@ static void enc424j600_setup_mac(struct device *dev) static int enc424j600_tx(struct device *dev, struct net_pkt *pkt) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint16_t len = net_pkt_get_len(pkt); struct net_buf *frag; uint16_t tmp; @@ -343,7 +343,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; + struct enc424j600_runtime *context = dev->data; const struct enc424j600_config *config = dev->config; uint8_t info[ENC424J600_RSV_SIZE + ENC424J600_PTR_NXP_PKT_SIZE]; struct net_buf *pkt_buf = NULL; @@ -441,7 +441,7 @@ done: static void enc424j600_rx_thread(struct device *dev) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint16_t eir; uint16_t estat; uint8_t counter; @@ -503,7 +503,7 @@ static enum ethernet_hw_caps enc424j600_get_capabilities(struct device *dev) static void enc424j600_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; net_if_set_link_addr(iface, context->mac_address, sizeof(context->mac_address), @@ -517,7 +517,7 @@ static void enc424j600_iface_init(struct net_if *iface) static int enc424j600_start_device(struct device *dev) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint16_t tmp; if (!context->suspended) { @@ -547,7 +547,7 @@ static int enc424j600_start_device(struct device *dev) static int enc424j600_stop_device(struct device *dev) { - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->data; uint16_t tmp; if (context->suspended) { @@ -597,7 +597,7 @@ static const struct ethernet_api api_funcs = { static int enc424j600_init(struct device *dev) { const struct enc424j600_config *config = dev->config; - struct enc424j600_runtime *context = dev->driver_data; + struct enc424j600_runtime *context = dev->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 c5a1f43c4b4..64773c3317e 100644 --- a/drivers/ethernet/eth_gecko_priv.h +++ b/drivers/ethernet/eth_gecko_priv.h @@ -98,7 +98,7 @@ struct eth_gecko_dev_data { #define DEV_CFG(dev) \ ((const struct eth_gecko_dev_cfg *)(dev)->config) #define DEV_DATA(dev) \ - ((struct eth_gecko_dev_data *)(dev)->driver_data) + ((struct eth_gecko_dev_data *)(dev)->data) /* PHY Management pins */ #define PIN_PHY_MDC {DT_INST_PROP_BY_IDX(0, location_phy_mdc, 1), \ diff --git a/drivers/ethernet/eth_liteeth.c b/drivers/ethernet/eth_liteeth.c index a89338b96f8..b7ee2e47dba 100644 --- a/drivers/ethernet/eth_liteeth.c +++ b/drivers/ethernet/eth_liteeth.c @@ -85,7 +85,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) { int key; uint16_t len; - struct eth_liteeth_dev_data *context = dev->driver_data; + struct eth_liteeth_dev_data *context = dev->data; key = irq_lock(); @@ -116,7 +116,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) static void eth_rx(struct device *port) { struct net_pkt *pkt; - struct eth_liteeth_dev_data *context = port->driver_data; + struct eth_liteeth_dev_data *context = port->data; unsigned int key, r; uint16_t len = 0; @@ -191,7 +191,7 @@ static const struct eth_liteeth_config eth_config = { static void eth_iface_init(struct net_if *iface) { struct device *port = net_if_get_device(iface); - struct eth_liteeth_dev_data *context = port->driver_data; + struct eth_liteeth_dev_data *context = port->data; static bool init_done; /* initialize only once */ diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index dd84e18e918..50a174d4ace 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -200,7 +200,7 @@ void eth_mcux_phy_stop(struct eth_context *context); static int eth_mcux_device_pm_control(struct device *dev, uint32_t command, void *context, device_pm_cb cb, void *arg) { - struct eth_context *eth_ctx = (struct eth_context *)dev->driver_data; + struct eth_context *eth_ctx = (struct eth_context *)dev->data; int ret = 0; if (!eth_ctx->clock_dev) { @@ -712,7 +712,7 @@ static bool eth_get_ptp_data(struct net_if *iface, struct net_pkt *pkt, static int eth_tx(struct device *dev, struct net_pkt *pkt) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; uint16_t total_len = net_pkt_get_len(pkt); status_t status; unsigned int imask; @@ -774,7 +774,7 @@ static int eth_tx(struct device *dev, struct net_pkt *pkt) static void eth_rx(struct device *iface) { - struct eth_context *context = iface->driver_data; + struct eth_context *context = iface->data; uint16_t vlan_tag = NET_VLAN_TAG_UNSPEC; uint32_t frame_length = 0U; struct net_pkt *pkt; @@ -930,7 +930,7 @@ static void eth_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param) { struct device *iface = param; - struct eth_context *context = iface->driver_data; + struct eth_context *context = iface->data; switch (event) { case kENET_RxEvent: @@ -1002,7 +1002,7 @@ static void generate_eth1_unique_mac(uint8_t *mac_addr) static void eth_mcux_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; enet_config_t enet_config; uint32_t sys_clock; enet_buffer_config_t buffer_config = { @@ -1093,7 +1093,7 @@ static void eth_mcux_init(struct device *dev) static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; #if defined(CONFIG_PTP_CLOCK_MCUX) ts_tx_rd = 0; @@ -1138,7 +1138,7 @@ static void net_if_mcast_cb(struct net_if *iface, bool is_joined) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; struct net_eth_addr mac_addr; net_eth_ipv6_mcast_to_mac_addr(addr, &mac_addr); @@ -1154,7 +1154,7 @@ static void net_if_mcast_cb(struct net_if *iface, static void eth_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; #if defined(CONFIG_NET_IPV6) static struct net_if_mcast_monitor mon; @@ -1199,7 +1199,7 @@ static enum ethernet_hw_caps eth_mcux_get_capabilities(struct device *dev) #if defined(CONFIG_PTP_CLOCK_MCUX) static struct device *eth_mcux_get_ptp_clock(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; return context->ptp_clock; } @@ -1218,7 +1218,7 @@ static const struct ethernet_api api_funcs = { static void eth_mcux_ptp_isr(void *p) { struct device *dev = p; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; ENET_Ptp1588TimerIRQHandler(context->base, &context->enet_handle); } @@ -1228,7 +1228,7 @@ static void eth_mcux_ptp_isr(void *p) static void eth_mcux_dispacher_isr(void *p) { struct device *dev = p; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; uint32_t EIR = ENET_GetInterruptStatus(context->base); int irq_lock_key = irq_lock(); @@ -1251,7 +1251,7 @@ static void eth_mcux_dispacher_isr(void *p) static void eth_mcux_rx_isr(void *p) { struct device *dev = p; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; ENET_ReceiveIRQHandler(context->base, &context->enet_handle); } @@ -1261,7 +1261,7 @@ static void eth_mcux_rx_isr(void *p) static void eth_mcux_tx_isr(void *p) { struct device *dev = p; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; ENET_TransmitIRQHandler(context->base, &context->enet_handle); } @@ -1271,7 +1271,7 @@ static void eth_mcux_tx_isr(void *p) static void eth_mcux_error_isr(void *p) { struct device *dev = p; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; uint32_t pending = ENET_GetInterruptStatus(context->base); if (pending & ENET_EIR_MII_MASK) { @@ -1401,7 +1401,7 @@ static struct ptp_context ptp_mcux_0_context; static int ptp_clock_mcux_set(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; struct eth_context *context = ptp_context->eth_context; enet_ptp_time_t enet_time; @@ -1414,7 +1414,7 @@ static int ptp_clock_mcux_set(struct device *dev, struct net_ptp_time *tm) static int ptp_clock_mcux_get(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; struct eth_context *context = ptp_context->eth_context; enet_ptp_time_t enet_time; @@ -1427,7 +1427,7 @@ static int ptp_clock_mcux_get(struct device *dev, struct net_ptp_time *tm) static int ptp_clock_mcux_adjust(struct device *dev, int increment) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; struct eth_context *context = ptp_context->eth_context; int key, ret; @@ -1455,7 +1455,7 @@ static int ptp_clock_mcux_adjust(struct device *dev, int increment) static int ptp_clock_mcux_rate_adjust(struct device *dev, float ratio) { const int hw_inc = NSEC_PER_SEC / CONFIG_ETH_MCUX_PTP_CLOCK_SRC_HZ; - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; struct eth_context *context = ptp_context->eth_context; int corr; int32_t mul; @@ -1513,8 +1513,8 @@ static const struct ptp_clock_driver_api api = { static int ptp_mcux_init(struct device *port) { struct device *eth_dev = DEVICE_GET(eth_mcux_0); - struct eth_context *context = eth_dev->driver_data; - struct ptp_context *ptp_context = port->driver_data; + struct eth_context *context = eth_dev->data; + struct ptp_context *ptp_context = port->data; context->ptp_clock = port; ptp_context->eth_context = context; diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c index fc6ad96929e..27995a47f4c 100644 --- a/drivers/ethernet/eth_native_posix.c +++ b/drivers/ethernet/eth_native_posix.c @@ -176,7 +176,7 @@ static void update_gptp(struct net_if *iface, struct net_pkt *pkt, static int eth_send(struct device *dev, struct net_pkt *pkt) { - struct eth_context *ctx = dev->driver_data; + struct eth_context *ctx = dev->data; int count = net_pkt_get_len(pkt); int ret; @@ -394,7 +394,7 @@ static void create_rx_handler(struct eth_context *ctx) static void eth_iface_init(struct net_if *iface) { - struct eth_context *ctx = net_if_get_device(iface)->driver_data; + struct eth_context *ctx = net_if_get_device(iface)->data; struct net_linkaddr *ll_addr = eth_get_mac(ctx); /* The iface pointer in context should contain the main interface @@ -479,7 +479,7 @@ enum ethernet_hw_caps eth_posix_native_get_capabilities(struct device *dev) #if defined(CONFIG_ETH_NATIVE_POSIX_PTP_CLOCK) static struct device *eth_get_ptp_clock(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; return context->ptp_clock; } @@ -488,7 +488,7 @@ static struct device *eth_get_ptp_clock(struct device *dev) #if defined(CONFIG_NET_STATISTICS_ETHERNET) static struct net_stats_eth *get_stats(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; return &(context->stats); } @@ -502,7 +502,7 @@ static int set_config(struct device *dev, if (IS_ENABLED(CONFIG_NET_PROMISCUOUS_MODE) && type == ETHERNET_CONFIG_TYPE_PROMISC_MODE) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; if (config->promisc_mode) { if (context->promisc_mode) { @@ -541,7 +541,7 @@ static int vlan_setup(struct device *dev, struct net_if *iface, static int eth_start_device(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; int ret; context->status = true; @@ -555,7 +555,7 @@ static int eth_start_device(struct device *dev) static int eth_stop_device(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; context->status = false; @@ -652,8 +652,8 @@ static const struct ptp_clock_driver_api api = { static int ptp_init(struct device *port) { struct device *eth_dev = DEVICE_GET(eth_native_posix); - struct eth_context *context = eth_dev->driver_data; - struct ptp_context *ptp_context = port->driver_data; + struct eth_context *context = eth_dev->data; + struct ptp_context *ptp_context = port->data; context->ptp_clock = port; ptp_context->eth_context = context; diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c index 3bfa523d672..9bbc3f5208f 100644 --- a/drivers/ethernet/eth_sam_gmac.c +++ b/drivers/ethernet/eth_sam_gmac.c @@ -2382,7 +2382,7 @@ static struct ptp_context ptp_gmac_0_context; static int ptp_clock_sam_gmac_set(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(ptp_context->eth_dev); Gmac *gmac = cfg->regs; @@ -2396,7 +2396,7 @@ static int ptp_clock_sam_gmac_set(struct device *dev, static int ptp_clock_sam_gmac_get(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(ptp_context->eth_dev); Gmac *gmac = cfg->regs; @@ -2408,7 +2408,7 @@ static int ptp_clock_sam_gmac_get(struct device *dev, static int ptp_clock_sam_gmac_adjust(struct device *dev, int increment) { - struct ptp_context *ptp_context = dev->driver_data; + struct ptp_context *ptp_context = dev->data; const struct eth_sam_dev_cfg *const cfg = DEV_CFG(ptp_context->eth_dev); Gmac *gmac = cfg->regs; @@ -2440,8 +2440,8 @@ static const struct ptp_clock_driver_api ptp_api = { static int ptp_gmac_init(struct device *port) { struct device *eth_dev = DEVICE_GET(eth0_sam_gmac); - struct eth_sam_dev_data *dev_data = eth_dev->driver_data; - struct ptp_context *ptp_context = port->driver_data; + struct eth_sam_dev_data *dev_data = eth_dev->data; + struct ptp_context *ptp_context = port->data; dev_data->ptp_clock = port; ptp_context->eth_dev = eth_dev; diff --git a/drivers/ethernet/eth_sam_gmac_priv.h b/drivers/ethernet/eth_sam_gmac_priv.h index d061ee2cb7a..6f476e78bd3 100644 --- a/drivers/ethernet/eth_sam_gmac_priv.h +++ b/drivers/ethernet/eth_sam_gmac_priv.h @@ -283,6 +283,6 @@ struct eth_sam_dev_data { #define DEV_CFG(dev) \ ((const struct eth_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct eth_sam_dev_data *const)(dev)->driver_data) + ((struct eth_sam_dev_data *const)(dev)->data) #endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_SAM_GMAC_PRIV_H_ */ diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c index 95b28aafdc1..aeef75b3642 100644 --- a/drivers/ethernet/eth_smsc911x.c +++ b/drivers/ethernet/eth_smsc911x.c @@ -421,7 +421,7 @@ static enum ethernet_hw_caps eth_smsc911x_get_capabilities(struct device *dev) #if defined(CONFIG_NET_STATISTICS_ETHERNET) static struct net_stats_eth *get_stats(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; return &context->stats; } @@ -430,7 +430,7 @@ static struct net_stats_eth *get_stats(struct device *dev) static void eth_initialize(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; LOG_DBG("eth_initialize"); @@ -555,7 +555,7 @@ static int smsc_read_rx_fifo(struct net_pkt *pkt, uint32_t len) static struct net_pkt *smsc_recv_pkt(struct device *dev, uint32_t pkt_size) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; struct net_pkt *pkt; uint32_t rem_size; @@ -595,7 +595,7 @@ static struct net_pkt *smsc_recv_pkt(struct device *dev, uint32_t pkt_size) static void eth_smsc911x_isr(struct device *dev) { uint32_t int_status = SMSC9220->INT_STS; - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; LOG_DBG("%s: INT_STS=%x INT_EN=%x", __func__, int_status, SMSC9220->INT_EN); diff --git a/drivers/ethernet/eth_stellaris_priv.h b/drivers/ethernet/eth_stellaris_priv.h index 8b31a62ce89..7f6534c1d28 100644 --- a/drivers/ethernet/eth_stellaris_priv.h +++ b/drivers/ethernet/eth_stellaris_priv.h @@ -9,7 +9,7 @@ #define ETH_STELLARIS_PRIV_H_ #define DEV_DATA(dev) \ - ((struct eth_stellaris_runtime *)(dev)->driver_data) + ((struct eth_stellaris_runtime *)(dev)->data) #define DEV_CFG(dev) \ ((const struct eth_stellaris_config *const)(dev)->config) /* diff --git a/drivers/ethernet/eth_stm32_hal_priv.h b/drivers/ethernet/eth_stm32_hal_priv.h index 2ef66c658fc..fea4b11ce7d 100644 --- a/drivers/ethernet/eth_stm32_hal_priv.h +++ b/drivers/ethernet/eth_stm32_hal_priv.h @@ -49,6 +49,6 @@ struct eth_stm32_hal_dev_data { #define DEV_CFG(dev) \ ((const struct eth_stm32_hal_dev_cfg *)(dev)->config) #define DEV_DATA(dev) \ - ((struct eth_stm32_hal_dev_data *)(dev)->driver_data) + ((struct eth_stm32_hal_dev_data *)(dev)->data) #endif /* ZEPHYR_DRIVERS_ETHERNET_ETH_STM32_HAL_PRIV_H_ */ diff --git a/drivers/flash/flash_gecko.c b/drivers/flash/flash_gecko.c index ecd698c62d8..71327617793 100644 --- a/drivers/flash/flash_gecko.c +++ b/drivers/flash/flash_gecko.c @@ -32,7 +32,7 @@ static const struct flash_parameters flash_gecko_parameters = { #define DEV_NAME(dev) ((dev)->name) #define DEV_DATA(dev) \ - ((struct flash_gecko_data *const)(dev)->driver_data) + ((struct flash_gecko_data *const)(dev)->data) static bool write_range_is_valid(off_t offset, uint32_t size); static bool read_range_is_valid(off_t offset, uint32_t size); diff --git a/drivers/flash/flash_page_layout.c b/drivers/flash/flash_page_layout.c index 0b579006bf2..c8357f1b901 100644 --- a/drivers/flash/flash_page_layout.c +++ b/drivers/flash/flash_page_layout.c @@ -9,7 +9,7 @@ static int flash_get_page_info(struct device *dev, off_t offs, bool use_addr, struct flash_pages_info *info) { - const struct flash_driver_api *api = dev->driver_api; + const struct flash_driver_api *api = dev->api; const struct flash_pages_layout *layout; size_t page_count = 0; off_t group_offs = 0; @@ -66,7 +66,7 @@ int z_impl_flash_get_page_info_by_idx(struct device *dev, uint32_t page_index, size_t z_impl_flash_get_page_count(struct device *dev) { - const struct flash_driver_api *api = dev->driver_api; + const struct flash_driver_api *api = dev->api; const struct flash_pages_layout *layout; size_t layout_size; size_t count = 0; @@ -83,7 +83,7 @@ size_t z_impl_flash_get_page_count(struct device *dev) void flash_page_foreach(struct device *dev, flash_page_cb cb, void *data) { - const struct flash_driver_api *api = dev->driver_api; + const struct flash_driver_api *api = dev->api; const struct flash_pages_layout *layout; struct flash_pages_info page_info; size_t block, num_blocks, page = 0, i; diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c index 9982044ece4..7651fb80bfd 100644 --- a/drivers/flash/flash_sam.c +++ b/drivers/flash/flash_sam.c @@ -55,7 +55,7 @@ static const struct flash_parameters flash_sam_parameters = { ((const struct flash_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct flash_sam_dev_data *const)(dev)->driver_data) + ((struct flash_sam_dev_data *const)(dev)->data) static inline void flash_sam_sem_take(struct device *dev) diff --git a/drivers/flash/flash_sam0.c b/drivers/flash/flash_sam0.c index 407def5efb1..cacc4fb784b 100644 --- a/drivers/flash/flash_sam0.c +++ b/drivers/flash/flash_sam0.c @@ -72,14 +72,14 @@ static const struct flash_parameters flash_sam0_parameters = { static inline void flash_sam0_sem_take(struct device *dev) { - struct flash_sam0_data *ctx = dev->driver_data; + struct flash_sam0_data *ctx = dev->data; k_sem_take(&ctx->sem, K_FOREVER); } static inline void flash_sam0_sem_give(struct device *dev) { - struct flash_sam0_data *ctx = dev->driver_data; + struct flash_sam0_data *ctx = dev->data; k_sem_give(&ctx->sem); } @@ -193,7 +193,7 @@ static int flash_sam0_erase_row(struct device *dev, off_t offset) static int flash_sam0_commit(struct device *dev) { - struct flash_sam0_data *ctx = dev->driver_data; + struct flash_sam0_data *ctx = dev->data; int err; int page; off_t offset = ctx->offset; @@ -224,7 +224,7 @@ static int flash_sam0_commit(struct device *dev) static int flash_sam0_write(struct device *dev, off_t offset, const void *data, size_t len) { - struct flash_sam0_data *ctx = dev->driver_data; + struct flash_sam0_data *ctx = dev->data; const uint8_t *pdata = data; off_t addr; int err; @@ -407,7 +407,7 @@ flash_sam0_get_parameters(const struct device *dev) static int flash_sam0_init(struct device *dev) { - struct flash_sam0_data *ctx = dev->driver_data; + struct flash_sam0_data *ctx = dev->data; k_sem_init(&ctx->sem, 1, 1); diff --git a/drivers/flash/flash_stm32.h b/drivers/flash/flash_stm32.h index 43659de6329..32a35cab7db 100644 --- a/drivers/flash/flash_stm32.h +++ b/drivers/flash/flash_stm32.h @@ -41,7 +41,7 @@ struct flash_stm32_priv { /* as flash node property 'write-block-size' */ #endif -#define FLASH_STM32_PRIV(dev) ((struct flash_stm32_priv *)((dev)->driver_data)) +#define FLASH_STM32_PRIV(dev) ((struct flash_stm32_priv *)((dev)->data)) #define FLASH_STM32_REGS(dev) (FLASH_STM32_PRIV(dev)->regs) #ifdef CONFIG_FLASH_PAGE_LAYOUT diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c index e666d115d81..eb1e0a4a138 100644 --- a/drivers/flash/nrf_qspi_nor.c +++ b/drivers/flash/nrf_qspi_nor.c @@ -232,7 +232,7 @@ static inline int qspi_get_zephyr_ret_code(nrfx_err_t res) static inline struct qspi_nor_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline void qspi_lock(struct device *dev) @@ -686,7 +686,7 @@ static int qspi_nor_write(struct device *dev, off_t addr, const void *src, return -EINVAL; } - struct qspi_nor_data *const driver_data = dev->driver_data; + struct qspi_nor_data *const driver_data = dev->data; const struct qspi_nor_config *params = dev->config; if (driver_data->write_protection) { @@ -722,7 +722,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; + struct qspi_nor_data *const driver_data = dev->data; const struct qspi_nor_config *params = dev->config; if (driver_data->write_protection) { @@ -746,7 +746,7 @@ static int qspi_nor_erase(struct device *dev, off_t addr, size_t size) static int qspi_nor_write_protection_set(struct device *dev, bool write_protect) { - struct qspi_nor_data *const driver_data = dev->driver_data; + struct qspi_nor_data *const driver_data = dev->data; int ret = 0; struct qspi_cmd cmd = { diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c index 20b6c86d395..842124142f7 100644 --- a/drivers/flash/soc_flash_mcux.c +++ b/drivers/flash/soc_flash_mcux.c @@ -138,7 +138,7 @@ static const struct flash_parameters flash_mcux_parameters = { static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; status_t rc; unsigned int key; @@ -172,7 +172,7 @@ static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) static int flash_mcux_read(struct device *dev, off_t offset, void *data, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; status_t rc = 0; @@ -203,7 +203,7 @@ static int flash_mcux_read(struct device *dev, off_t offset, static int flash_mcux_write(struct device *dev, off_t offset, const void *data, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; status_t rc; unsigned int key; @@ -225,7 +225,7 @@ static int flash_mcux_write(struct device *dev, off_t offset, static int flash_mcux_write_protection(struct device *dev, bool enable) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; int rc = 0; if (enable) { @@ -276,7 +276,7 @@ static const struct flash_driver_api flash_mcux_api = { static int flash_mcux_init(struct device *dev) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t pflash_block_base; status_t rc; diff --git a/drivers/flash/soc_flash_nios2_qspi.c b/drivers/flash/soc_flash_nios2_qspi.c index 51b7bf87992..07cf0555dc2 100644 --- a/drivers/flash/soc_flash_nios2_qspi.c +++ b/drivers/flash/soc_flash_nios2_qspi.c @@ -68,7 +68,7 @@ static const struct flash_parameters flash_nios2_qspi_parameters = { static int flash_nios2_qspi_erase(struct device *dev, off_t offset, size_t len) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; uint32_t block_offset, offset_in_block, length_to_erase; uint32_t erase_offset = offset; /* address of next byte to erase */ @@ -164,7 +164,7 @@ static int flash_nios2_qspi_write_block(struct device *dev, int block_offset, int mem_offset, const void *data, size_t len) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; uint32_t buffer_offset = 0U; /* offset into data buffer to get write data */ int32_t remaining_length = len; /* length left to write */ @@ -261,7 +261,7 @@ qspi_write_block_err: static int flash_nios2_qspi_write(struct device *dev, off_t offset, const void *data, size_t len) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; uint32_t block_offset, offset_in_block, length_to_write; uint32_t write_offset = offset; /* address of next byte to write */ @@ -327,7 +327,7 @@ qspi_write_err: static int flash_nios2_qspi_read(struct device *dev, off_t offset, void *data, size_t len) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; uint32_t buffer_offset = 0U; /* offset into data buffer to get read data */ uint32_t remaining_length = len; /* length left to read */ @@ -393,7 +393,7 @@ static int flash_nios2_qspi_read(struct device *dev, off_t offset, static int flash_nios2_qspi_write_protection(struct device *dev, bool enable) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; alt_qspi_controller2_dev *qspi_dev = &flash_cfg->qspi_dev; uint32_t status, lock_val; int32_t rc = 0, timeout; @@ -476,7 +476,7 @@ static const struct flash_driver_api flash_nios2_qspi_api = { static int flash_nios2_qspi_init(struct device *dev) { - struct flash_nios2_qspi_config *flash_cfg = dev->driver_data; + struct flash_nios2_qspi_config *flash_cfg = dev->data; k_sem_init(&flash_cfg->sem_lock, 1, 1); return 0; diff --git a/drivers/flash/soc_flash_rv32m1.c b/drivers/flash/soc_flash_rv32m1.c index 5c7defccc83..e8e31fcdc53 100644 --- a/drivers/flash/soc_flash_rv32m1.c +++ b/drivers/flash/soc_flash_rv32m1.c @@ -44,7 +44,7 @@ static const struct flash_parameters flash_mcux_parameters = { static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; status_t rc; unsigned int key; @@ -67,7 +67,7 @@ static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) static int flash_mcux_read(struct device *dev, off_t offset, void *data, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; /* @@ -85,7 +85,7 @@ static int flash_mcux_read(struct device *dev, off_t offset, static int flash_mcux_write(struct device *dev, off_t offset, const void *data, size_t len) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t addr; status_t rc; unsigned int key; @@ -107,7 +107,7 @@ static int flash_mcux_write(struct device *dev, off_t offset, static int flash_mcux_write_protection(struct device *dev, bool enable) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; int rc = 0; if (enable) { @@ -159,7 +159,7 @@ static const struct flash_driver_api flash_mcux_api = { static int flash_mcux_init(struct device *dev) { - struct flash_priv *priv = dev->driver_data; + struct flash_priv *priv = dev->data; uint32_t pflash_block_base; status_t rc; diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index 61133e7aa23..77cdbf02179 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -85,7 +85,7 @@ static const struct flash_parameters flash_at45_parameters = { static struct spi_flash_at45_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static const struct spi_flash_at45_config *get_dev_config(struct device *dev) diff --git a/drivers/flash/spi_flash_w25qxxdv.c b/drivers/flash/spi_flash_w25qxxdv.c index e961328af8e..5cc1b6aded2 100644 --- a/drivers/flash/spi_flash_w25qxxdv.c +++ b/drivers/flash/spi_flash_w25qxxdv.c @@ -18,7 +18,7 @@ #if defined(CONFIG_MULTITHREADING) #define SYNC_INIT() k_sem_init( \ - &((struct spi_flash_data *)dev->driver_data)->sem, 1, UINT_MAX) + &((struct spi_flash_data *)dev->data)->sem, 1, UINT_MAX) #define SYNC_LOCK() k_sem_take(&driver_data->sem, K_FOREVER) #define SYNC_UNLOCK() k_sem_give(&driver_data->sem) #else @@ -78,7 +78,7 @@ static int spi_flash_wb_access(struct spi_flash_data *ctx, static inline int spi_flash_wb_id(struct device *dev) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; uint32_t temp_data; uint8_t buf[3]; @@ -100,7 +100,7 @@ static inline int spi_flash_wb_id(struct device *dev) static uint8_t spi_flash_wb_reg_read(struct device *dev, uint8_t reg) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; if (spi_flash_wb_access(driver_data, reg, false, 0, ®, 1, false)) { @@ -121,7 +121,7 @@ static inline void wait_for_flash_idle(struct device *dev) static int spi_flash_wb_reg_write(struct device *dev, uint8_t reg) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; if (spi_flash_wb_access(driver_data, reg, false, 0, NULL, 0, true) != 0) { @@ -134,7 +134,7 @@ static int spi_flash_wb_reg_write(struct device *dev, uint8_t reg) static int spi_flash_wb_read(struct device *dev, off_t offset, void *data, size_t len) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; int ret; if (offset < 0) { @@ -156,7 +156,7 @@ static int spi_flash_wb_read(struct device *dev, off_t offset, void *data, static int spi_flash_wb_write_protection_set_with_lock(struct device *dev, bool enable, bool lock) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; uint8_t reg = 0U; int ret; @@ -190,7 +190,7 @@ static int spi_flash_wb_program_page(struct device *dev, off_t offset, const void *data, size_t len) { uint8_t reg; - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; __ASSERT(len <= CONFIG_SPI_FLASH_W25QXXDV_PAGE_PROGRAM_SIZE, "Maximum length is %d for page programming (actual:%d)", @@ -221,7 +221,7 @@ static int spi_flash_wb_write(struct device *dev, off_t offset, off_t page_offset; /* Cast `data` to prevent `void*` arithmetic */ const uint8_t *data_ptr = data; - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; if (offset < 0) { return -ENOTSUP; @@ -278,7 +278,7 @@ end: static inline int spi_flash_wb_erase_internal(struct device *dev, off_t offset, size_t size) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; bool need_offset = true; uint8_t erase_opcode; @@ -322,7 +322,7 @@ static inline int spi_flash_wb_erase_internal(struct device *dev, static int spi_flash_wb_erase(struct device *dev, off_t offset, size_t size) { - struct spi_flash_data *const driver_data = dev->driver_data; + struct spi_flash_data *const driver_data = dev->data; int ret = 0; uint32_t new_offset = offset; uint32_t size_remaining = size; @@ -414,7 +414,7 @@ static const struct flash_driver_api spi_flash_api = { static int spi_flash_wb_configure(struct device *dev) { - struct spi_flash_data *data = dev->driver_data; + struct spi_flash_data *data = dev->data; data->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!data->spi) { diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index 51cbe7a8db9..0ba040dce02 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -93,7 +93,7 @@ static const struct flash_parameters flash_nor_parameters = { static inline void record_entered_dpd(const struct device *const dev) { #if DT_INST_NODE_HAS_PROP(0, has_dpd) - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; driver_data->ts_enter_dpd = k_uptime_get_32(); #endif @@ -105,7 +105,7 @@ static inline void record_entered_dpd(const struct device *const dev) static inline void delay_until_exit_dpd_ok(const struct device *const dev) { #if DT_INST_NODE_HAS_PROP(0, has_dpd) - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; int32_t since = (int32_t)(k_uptime_get_32() - driver_data->ts_enter_dpd); /* If the time is negative the 32-bit counter has wrapped, @@ -147,7 +147,7 @@ static int spi_nor_access(const struct device *const dev, uint8_t opcode, bool is_addressed, off_t addr, void *data, size_t length, bool is_write) { - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; uint8_t buf[4] = { opcode, @@ -248,7 +248,7 @@ static int exit_dpd(const struct device *const dev) static void acquire_device(struct device *dev) { if (IS_ENABLED(CONFIG_MULTITHREADING)) { - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; k_sem_take(&driver_data->sem, K_FOREVER); } @@ -270,7 +270,7 @@ static void release_device(struct device *dev) } if (IS_ENABLED(CONFIG_MULTITHREADING)) { - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; k_sem_give(&driver_data->sem); } @@ -485,7 +485,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; + struct spi_nor_data *data = dev->data; const struct spi_nor_config *params = dev->config; data->spi = device_get_binding(DT_INST_BUS_LABEL(0)); @@ -536,7 +536,7 @@ static int spi_nor_configure(struct device *dev) static int spi_nor_init(struct device *dev) { if (IS_ENABLED(CONFIG_MULTITHREADING)) { - struct spi_nor_data *const driver_data = dev->driver_data; + struct spi_nor_data *const driver_data = dev->data; k_sem_init(&driver_data->sem, 1, UINT_MAX); } diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c index 8c036410ef1..4c03e6f8e44 100644 --- a/drivers/gpio/gpio_cc13xx_cc26xx.c +++ b/drivers/gpio/gpio_cc13xx_cc26xx.c @@ -181,7 +181,7 @@ static int gpio_cc13xx_cc26xx_manage_callback(struct device *port, struct gpio_callback *callback, bool set) { - struct gpio_cc13xx_cc26xx_data *data = port->driver_data; + struct gpio_cc13xx_cc26xx_data *data = port->data; return gpio_manage_callback(&data->callbacks, callback, set); } @@ -196,7 +196,7 @@ DEVICE_DECLARE(gpio_cc13xx_cc26xx); static void gpio_cc13xx_cc26xx_isr(void *arg) { struct device *dev = arg; - struct gpio_cc13xx_cc26xx_data *data = dev->driver_data; + struct gpio_cc13xx_cc26xx_data *data = dev->data; uint32_t status = GPIO_getEventMultiDio(GPIO_DIO_ALL_MASK); diff --git a/drivers/gpio/gpio_cc32xx.c b/drivers/gpio/gpio_cc32xx.c index b0eb680132f..3a22aaa7a2a 100644 --- a/drivers/gpio/gpio_cc32xx.c +++ b/drivers/gpio/gpio_cc32xx.c @@ -62,7 +62,7 @@ struct gpio_cc32xx_data { #define DEV_CFG(dev) \ ((const struct gpio_cc32xx_config *)(dev)->config) #define DEV_DATA(dev) \ - ((struct gpio_cc32xx_data *)(dev)->driver_data) + ((struct gpio_cc32xx_data *)(dev)->data) static int gpio_cc32xx_port_set_bits_raw(struct device *port, uint32_t mask); static int gpio_cc32xx_port_clear_bits_raw(struct device *port, uint32_t mask); diff --git a/drivers/gpio/gpio_cmsdk_ahb.c b/drivers/gpio/gpio_cmsdk_ahb.c index b4d03407211..0576ed08b75 100644 --- a/drivers/gpio/gpio_cmsdk_ahb.c +++ b/drivers/gpio/gpio_cmsdk_ahb.c @@ -188,7 +188,7 @@ static void gpio_cmsdk_ahb_isr(void *arg) { struct device *dev = (struct device *)arg; const struct gpio_cmsdk_ahb_cfg * const cfg = dev->config; - struct gpio_cmsdk_ahb_dev_data *data = dev->driver_data; + struct gpio_cmsdk_ahb_dev_data *data = dev->data; uint32_t int_stat; int_stat = cfg->port->intstatus; @@ -204,7 +204,7 @@ static int gpio_cmsdk_ahb_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_cmsdk_ahb_dev_data *data = dev->driver_data; + struct gpio_cmsdk_ahb_dev_data *data = dev->data; return gpio_manage_callback(&data->gpio_cb, callback, set); } diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index bada03f1ef1..51b5190a7df 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -91,7 +91,7 @@ static inline void gpio_dw_clock_config(struct device *port) clk = device_get_binding(drv); if (clk) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; context->clock = clk; } @@ -100,7 +100,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; - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; clock_control_on(context->clock, config->clock_data); } @@ -108,7 +108,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; - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; clock_control_off(context->clock, config->clock_data); } @@ -210,7 +210,7 @@ static int gpio_dw_pin_interrupt_configure(struct device *port, gpio_pin_t pin, enum gpio_int_mode mode, enum gpio_int_trig trig) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; 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; @@ -274,7 +274,7 @@ static int gpio_dw_pin_interrupt_configure(struct device *port, static inline void dw_pin_config(struct device *port, uint32_t pin, int flags) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; 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; @@ -341,7 +341,7 @@ static inline int gpio_dw_config(struct device *port, static int gpio_dw_port_get_raw(struct device *port, uint32_t *value) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t ext_port = dw_get_ext_port(port_base_addr); @@ -354,7 +354,7 @@ static int gpio_dw_port_get_raw(struct device *port, uint32_t *value) static int gpio_dw_port_set_masked_raw(struct device *port, uint32_t mask, uint32_t value) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t data_port = dw_get_data_port(port_base_addr); @@ -369,7 +369,7 @@ static int gpio_dw_port_set_masked_raw(struct device *port, static int gpio_dw_port_set_bits_raw(struct device *port, uint32_t mask) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t data_port = dw_get_data_port(port_base_addr); @@ -384,7 +384,7 @@ static int gpio_dw_port_set_bits_raw(struct device *port, uint32_t mask) static int gpio_dw_port_clear_bits_raw(struct device *port, uint32_t mask) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t data_port = dw_get_data_port(port_base_addr); @@ -399,7 +399,7 @@ static int gpio_dw_port_clear_bits_raw(struct device *port, uint32_t mask) static int gpio_dw_port_toggle_bits(struct device *port, uint32_t mask) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t port_base_addr = context->base_addr; uint32_t data_port = dw_get_data_port(port_base_addr); @@ -416,7 +416,7 @@ static inline int gpio_dw_manage_callback(struct device *port, struct gpio_callback *callback, bool set) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; return gpio_manage_callback(&context->callbacks, callback, set); } @@ -424,14 +424,14 @@ static inline int gpio_dw_manage_callback(struct device *port, #ifdef CONFIG_DEVICE_POWER_MANAGEMENT static void gpio_dw_set_power_state(struct device *port, uint32_t power_state) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; context->device_power_state = power_state; } static uint32_t gpio_dw_get_power_state(struct device *port) { - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; return context->device_power_state; } @@ -485,7 +485,7 @@ static int gpio_dw_device_ctrl(struct device *port, uint32_t ctrl_command, static void gpio_dw_isr(void *arg) { struct device *port = (struct device *)arg; - struct gpio_dw_runtime *context = port->driver_data; + struct gpio_dw_runtime *context = port->data; uint32_t base_addr = dw_base_to_block_base(context->base_addr); uint32_t int_status; @@ -519,7 +519,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; + struct gpio_dw_runtime *context = port->data; const struct gpio_dw_config *config = port->config; uint32_t base_addr; diff --git a/drivers/gpio/gpio_esp32.c b/drivers/gpio/gpio_esp32.c index 1fb71da8d3c..d5f76cf8e65 100644 --- a/drivers/gpio/gpio_esp32.c +++ b/drivers/gpio/gpio_esp32.c @@ -60,7 +60,7 @@ static int gpio_esp32_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - struct gpio_esp32_data *data = dev->driver_data; + struct gpio_esp32_data *data = dev->data; uint32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */ uint32_t *reg = GET_GPIO_PIN_REG(io_pin); uint32_t func; @@ -117,7 +117,7 @@ static int gpio_esp32_config(struct device *dev, static int gpio_esp32_port_get_raw(struct device *port, uint32_t *value) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; *value = *data->port.input_reg; @@ -127,7 +127,7 @@ static int gpio_esp32_port_get_raw(struct device *port, uint32_t *value) static int gpio_esp32_port_set_masked_raw(struct device *port, uint32_t mask, uint32_t value) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; uint32_t key; key = irq_lock(); @@ -141,7 +141,7 @@ static int gpio_esp32_port_set_masked_raw(struct device *port, static int gpio_esp32_port_set_bits_raw(struct device *port, uint32_t pins) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; *data->port.set_reg = pins; return 0; @@ -150,7 +150,7 @@ static int gpio_esp32_port_set_bits_raw(struct device *port, static int gpio_esp32_port_clear_bits_raw(struct device *port, uint32_t pins) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; *data->port.clear_reg = pins; return 0; @@ -159,7 +159,7 @@ static int gpio_esp32_port_clear_bits_raw(struct device *port, static int gpio_esp32_port_toggle_bits(struct device *port, uint32_t pins) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; uint32_t key; key = irq_lock(); @@ -218,7 +218,7 @@ static int gpio_esp32_pin_interrupt_configure(struct device *port, enum gpio_int_mode mode, enum gpio_int_trig trig) { - struct gpio_esp32_data *data = port->driver_data; + struct gpio_esp32_data *data = port->data; uint32_t io_pin = pin + data->port.pin_offset; /* Range from 0 - 39 */ uint32_t *reg = GET_GPIO_PIN_REG(io_pin); int intr_trig_mode = convert_int_type(mode, trig); @@ -248,14 +248,14 @@ static int gpio_esp32_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_esp32_data *data = dev->driver_data; + struct gpio_esp32_data *data = dev->data; return gpio_manage_callback(&data->cb, callback, set); } static void gpio_esp32_fire_callbacks(struct device *device) { - struct gpio_esp32_data *data = device->driver_data; + struct gpio_esp32_data *data = device->data; uint32_t irq_status = *data->port.irq_status_reg; *data->port.irq_ack_reg = irq_status; @@ -267,7 +267,7 @@ static void gpio_esp32_isr(void *param); static int gpio_esp32_init(struct device *device) { - struct gpio_esp32_data *data = device->driver_data; + struct gpio_esp32_data *data = device->data; static bool isr_connected; data->pinmux = device_get_binding(CONFIG_PINMUX_NAME); diff --git a/drivers/gpio/gpio_gecko.c b/drivers/gpio/gpio_gecko.c index 2223d635487..52e3ef0d9eb 100644 --- a/drivers/gpio/gpio_gecko.c +++ b/drivers/gpio/gpio_gecko.c @@ -180,7 +180,7 @@ static int gpio_gecko_pin_interrupt_configure(struct device *dev, enum gpio_int_trig trig) { const struct gpio_gecko_config *config = dev->config; - struct gpio_gecko_data *data = dev->driver_data; + struct gpio_gecko_data *data = dev->data; /* Interrupt on static level is not supported by the hardware */ if (mode == GPIO_INT_MODE_LEVEL) { @@ -221,7 +221,7 @@ static int gpio_gecko_pin_interrupt_configure(struct device *dev, static int gpio_gecko_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_gecko_data *data = dev->driver_data; + struct gpio_gecko_data *data = dev->data; return gpio_manage_callback(&data->callbacks, callback, set); } @@ -232,7 +232,7 @@ static int gpio_gecko_manage_callback(struct device *dev, static void gpio_gecko_common_isr(void *arg) { struct device *dev = (struct device *)arg; - struct gpio_gecko_common_data *data = dev->driver_data; + struct gpio_gecko_common_data *data = dev->data; uint32_t enabled_int, int_status; struct device *port_dev; struct gpio_gecko_data *port_data; @@ -241,7 +241,7 @@ static void gpio_gecko_common_isr(void *arg) for (unsigned int i = 0; int_status && (i < data->count); i++) { port_dev = data->ports[i]; - port_data = port_dev->driver_data; + port_data = port_dev->data; enabled_int = int_status & port_data->int_enabled_mask; if (enabled_int != 0) { int_status &= ~enabled_int; diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c index 6e4db488e2a..73df86b9852 100644 --- a/drivers/gpio/gpio_ht16k33.c +++ b/drivers/gpio/gpio_ht16k33.c @@ -124,7 +124,7 @@ static int gpio_ht16k33_pin_interrupt_configure(struct device *port, void ht16k33_process_keyscan_row_data(struct device *dev, uint32_t keys) { - struct gpio_ht16k33_data *data = dev->driver_data; + struct gpio_ht16k33_data *data = dev->data; gpio_fire_callbacks(&data->callbacks, dev, keys); } @@ -133,14 +133,14 @@ static int gpio_ht16k33_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_ht16k33_data *data = dev->driver_data; + struct gpio_ht16k33_data *data = dev->data; return gpio_manage_callback(&data->callbacks, callback, set); } static uint32_t gpio_ht16k33_get_pending_int(struct device *dev) { - struct gpio_ht16k33_data *data = dev->driver_data; + struct gpio_ht16k33_data *data = dev->data; return ht16k33_get_pending_int(data->parent); } @@ -148,7 +148,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; - struct gpio_ht16k33_data *data = dev->driver_data; + struct gpio_ht16k33_data *data = dev->data; if (config->keyscan_idx >= HT16K33_KEYSCAN_ROWS) { LOG_ERR("HT16K33 keyscan index out of bounds (%d)", diff --git a/drivers/gpio/gpio_imx.c b/drivers/gpio/gpio_imx.c index df99f8b6c40..0eecb95eb00 100644 --- a/drivers/gpio/gpio_imx.c +++ b/drivers/gpio/gpio_imx.c @@ -177,7 +177,7 @@ static int imx_gpio_pin_interrupt_configure(struct device *port, static int imx_gpio_manage_callback(struct device *port, struct gpio_callback *cb, bool set) { - struct imx_gpio_data *data = port->driver_data; + struct imx_gpio_data *data = port->data; return gpio_manage_callback(&data->callbacks, cb, set); } @@ -186,7 +186,7 @@ static void imx_gpio_port_isr(void *arg) { struct device *port = (struct device *)arg; const struct imx_gpio_config *config = port->config; - struct imx_gpio_data *data = port->driver_data; + struct imx_gpio_data *data = port->data; uint32_t int_status; int_status = config->base->ISR; diff --git a/drivers/gpio/gpio_intel_apl.c b/drivers/gpio/gpio_intel_apl.c index ac5d454c9c1..9ec57fdf093 100644 --- a/drivers/gpio/gpio_intel_apl.c +++ b/drivers/gpio/gpio_intel_apl.c @@ -106,7 +106,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) -#define DEV_DATA(_dev) ((struct gpio_intel_apl_data *)(_dev)->driver_data) +#define DEV_DATA(_dev) ((struct gpio_intel_apl_data *)(_dev)->data) struct gpio_intel_apl_config { /* gpio_driver_config needs to be first */ @@ -144,7 +144,7 @@ static inline mm_reg_t regs(struct device *dev) */ static bool check_perm(struct device *dev, uint32_t raw_pin) { - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; uint32_t offset, val; /* First is to establish that host software owns the pin */ @@ -196,7 +196,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; - data = dev->driver_data; + data = dev->data; reg = regs(dev) + REG_GPI_INT_STS_BASE + ((cfg->pin_offset >> 5) << 2); @@ -221,7 +221,7 @@ 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; - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; uint32_t raw_pin, reg, cfg0, cfg1; /* Only support push-pull mode */ @@ -296,7 +296,7 @@ static int gpio_intel_apl_pin_interrupt_configure(struct device *dev, enum gpio_int_trig trig) { const struct gpio_intel_apl_config *cfg = dev->config; - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; uint32_t raw_pin, cfg0, cfg1; uint32_t reg, reg_en, reg_sts; @@ -386,7 +386,7 @@ static int gpio_intel_apl_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; return gpio_manage_callback(&data->cb, callback, set); } @@ -395,7 +395,7 @@ 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; - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; uint32_t pin, raw_pin, reg_addr, reg_val, cmp; if (read_tx) { @@ -434,7 +434,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; - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; uint32_t pin, raw_pin, reg_addr, reg_val; while (mask != 0) { @@ -522,7 +522,7 @@ static const struct gpio_driver_api gpio_intel_apl_api = { int gpio_intel_apl_init(struct device *dev) { - struct gpio_intel_apl_data *data = dev->driver_data; + struct gpio_intel_apl_data *data = dev->data; DEVICE_MMIO_NAMED_MAP(dev, reg_base, K_MEM_CACHE_NONE); data->pad_base = sys_read32(regs(dev) + REG_PAD_BASE_ADDR); diff --git a/drivers/gpio/gpio_lmp90xxx.c b/drivers/gpio/gpio_lmp90xxx.c index bb0d9405388..62b72cd4a9b 100644 --- a/drivers/gpio/gpio_lmp90xxx.c +++ b/drivers/gpio/gpio_lmp90xxx.c @@ -37,7 +37,7 @@ struct gpio_lmp90xxx_data { static int gpio_lmp90xxx_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; int err = 0; if (pin > LMP90XXX_GPIO_MAX) { @@ -85,7 +85,7 @@ static int gpio_lmp90xxx_config(struct device *dev, static int gpio_lmp90xxx_port_get_raw(struct device *dev, gpio_port_value_t *value) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; return lmp90xxx_gpio_port_get_raw(data->parent, value); } @@ -94,7 +94,7 @@ static int gpio_lmp90xxx_port_set_masked_raw(struct device *dev, gpio_port_pins_t mask, gpio_port_value_t value) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; return lmp90xxx_gpio_port_set_masked_raw(data->parent, mask, value); } @@ -102,7 +102,7 @@ static int gpio_lmp90xxx_port_set_masked_raw(struct device *dev, static int gpio_lmp90xxx_port_set_bits_raw(struct device *dev, gpio_port_pins_t pins) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; return lmp90xxx_gpio_port_set_bits_raw(data->parent, pins); } @@ -110,7 +110,7 @@ static int gpio_lmp90xxx_port_set_bits_raw(struct device *dev, static int gpio_lmp90xxx_port_clear_bits_raw(struct device *dev, gpio_port_pins_t pins) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; return lmp90xxx_gpio_port_clear_bits_raw(data->parent, pins); } @@ -118,7 +118,7 @@ static int gpio_lmp90xxx_port_clear_bits_raw(struct device *dev, static int gpio_lmp90xxx_port_toggle_bits(struct device *dev, gpio_port_pins_t pins) { - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; return lmp90xxx_gpio_port_toggle_bits(data->parent, pins); } @@ -139,7 +139,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; - struct gpio_lmp90xxx_data *data = dev->driver_data; + struct gpio_lmp90xxx_data *data = dev->data; data->parent = device_get_binding(config->parent_dev_name); if (!data->parent) { diff --git a/drivers/gpio/gpio_lpc11u6x.c b/drivers/gpio/gpio_lpc11u6x.c index 9e5ab20fb61..550c0fae514 100644 --- a/drivers/gpio/gpio_lpc11u6x.c +++ b/drivers/gpio/gpio_lpc11u6x.c @@ -26,7 +26,7 @@ #define DEV_CFG(dev) ((const struct gpio_lpc11u6x_config *) \ ((dev)->config)) #define DEV_DATA(dev) ((struct gpio_lpc11u6x_data *) \ - ((dev)->driver_data)) + ((dev)->data)) /* Offset from syscon base address. */ #define LPC11U6X_PINTSEL_REGS 0x178 @@ -469,21 +469,21 @@ static void gpio_lpc11u6x_isr(void *arg) #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay) if (pins[0]) { port = DEVICE_GET(gpio_lpc11u6x_0); - data = port->driver_data; + data = port->data; gpio_fire_callbacks(&data->cb_list, port, pins[0]); } #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay) if (pins[1]) { port = DEVICE_GET(gpio_lpc11u6x_1); - data = port->driver_data; + data = port->data; gpio_fire_callbacks(&data->cb_list, port, pins[1]); } #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio2), okay) if (pins[2]) { port = DEVICE_GET(gpio_lpc11u6x_2); - data = port->driver_data; + data = port->data; gpio_fire_callbacks(&data->cb_list, port, pins[2]); } #endif diff --git a/drivers/gpio/gpio_mchp_xec.c b/drivers/gpio/gpio_mchp_xec.c index 85613f18b34..b745598342e 100644 --- a/drivers/gpio/gpio_mchp_xec.c +++ b/drivers/gpio/gpio_mchp_xec.c @@ -267,7 +267,7 @@ static int gpio_xec_port_get_raw(struct device *dev, uint32_t *value) static int gpio_xec_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_xec_data *data = dev->driver_data; + struct gpio_xec_data *data = dev->data; gpio_manage_callback(&data->callbacks, callback, set); @@ -278,7 +278,7 @@ static void gpio_gpio_xec_port_isr(void *arg) { struct device *dev = (struct device *)arg; const struct gpio_xec_config *config = dev->config; - struct gpio_xec_data *data = dev->driver_data; + struct gpio_xec_data *data = dev->data; uint32_t girq_result; /* Figure out which interrupts have been triggered from the EC diff --git a/drivers/gpio/gpio_mcp23s17.c b/drivers/gpio/gpio_mcp23s17.c index db3c8fdc52b..d33c67c2601 100644 --- a/drivers/gpio/gpio_mcp23s17.c +++ b/drivers/gpio/gpio_mcp23s17.c @@ -40,7 +40,7 @@ LOG_MODULE_REGISTER(gpio_mcp23s17); static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; int ret; uint16_t port_data; @@ -98,7 +98,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 value) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; int ret; uint16_t port_data; @@ -146,7 +146,7 @@ static int write_port_regs(struct device *dev, uint8_t reg, uint16_t value) static int setup_pin_dir(struct device *dev, uint32_t pin, int flags) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; uint16_t *dir = &drv_data->reg_cache.iodir; uint16_t *output = &drv_data->reg_cache.gpio; int ret; @@ -184,7 +184,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) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; uint16_t port; int ret; @@ -210,7 +210,7 @@ static int mcp23s17_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; int ret; /* Can't do SPI bus operations from an ISR */ @@ -245,7 +245,7 @@ done: static int mcp23s17_port_get_raw(struct device *dev, uint32_t *value) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; uint16_t buf; int ret; @@ -272,7 +272,7 @@ static int mcp23s17_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; uint16_t buf; int ret; @@ -309,7 +309,7 @@ static int mcp23s17_port_clear_bits_raw(struct device *dev, uint32_t mask) static int mcp23s17_port_toggle_bits(struct device *dev, uint32_t mask) { struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; uint16_t buf; int ret; @@ -362,7 +362,7 @@ static int mcp23s17_init(struct device *dev) const struct mcp23s17_config *const config = dev->config; struct mcp23s17_drv_data *const drv_data = - (struct mcp23s17_drv_data *const)dev->driver_data; + (struct mcp23s17_drv_data *const)dev->data; drv_data->spi = device_get_binding((char *)config->spi_dev_name); if (!drv_data->spi) { diff --git a/drivers/gpio/gpio_mcux.c b/drivers/gpio/gpio_mcux.c index 257d45df470..02f9ec6f3b3 100644 --- a/drivers/gpio/gpio_mcux.c +++ b/drivers/gpio/gpio_mcux.c @@ -217,7 +217,7 @@ static int gpio_mcux_pin_interrupt_configure(struct device *dev, static int gpio_mcux_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_mcux_data *data = dev->driver_data; + struct gpio_mcux_data *data = dev->data; return gpio_manage_callback(&data->callbacks, callback, set); } @@ -226,7 +226,7 @@ static void gpio_mcux_port_isr(void *arg) { struct device *dev = (struct device *)arg; const struct gpio_mcux_config *config = dev->config; - struct gpio_mcux_data *data = dev->driver_data; + struct gpio_mcux_data *data = dev->data; uint32_t int_status; int_status = config->port_base->ISFR; diff --git a/drivers/gpio/gpio_mcux_igpio.c b/drivers/gpio/gpio_mcux_igpio.c index bc4da6a915d..608fd80bc43 100644 --- a/drivers/gpio/gpio_mcux_igpio.c +++ b/drivers/gpio/gpio_mcux_igpio.c @@ -166,7 +166,7 @@ static int mcux_igpio_pin_interrupt_configure(struct device *dev, static int mcux_igpio_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct mcux_igpio_data *data = dev->driver_data; + struct mcux_igpio_data *data = dev->data; return gpio_manage_callback(&data->callbacks, callback, set); } @@ -175,7 +175,7 @@ static void mcux_igpio_port_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_igpio_config *config = dev->config; - struct mcux_igpio_data *data = dev->driver_data; + struct mcux_igpio_data *data = dev->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 5e053687470..5d4abbe4faa 100644 --- a/drivers/gpio/gpio_mcux_lpc.c +++ b/drivers/gpio/gpio_mcux_lpc.c @@ -174,7 +174,7 @@ static void gpio_mcux_lpc_port_isr(void *arg) { struct device *dev = (struct device *)arg; const struct gpio_mcux_lpc_config *config = dev->config; - struct gpio_mcux_lpc_data *data = dev->driver_data; + struct gpio_mcux_lpc_data *data = dev->data; uint32_t enabled_int; uint32_t int_flags; uint32_t pin; @@ -246,7 +246,7 @@ static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev, enum gpio_int_trig trig) { const struct gpio_mcux_lpc_config *config = dev->config; - struct gpio_mcux_lpc_data *data = dev->driver_data; + struct gpio_mcux_lpc_data *data = dev->data; pint_pin_enable_t interruptMode = kPINT_PinIntEnableNone; GPIO_Type *gpio_base = config->gpio_base; uint32_t port = config->port_no; @@ -311,7 +311,7 @@ static int gpio_mcux_lpc_pin_interrupt_configure(struct device *dev, static int gpio_mcux_lpc_manage_cb(struct device *port, struct gpio_callback *callback, bool set) { - struct gpio_mcux_lpc_data *data = port->driver_data; + struct gpio_mcux_lpc_data *data = port->data; return gpio_manage_callback(&data->callbacks, callback, set); } @@ -319,7 +319,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; - struct gpio_mcux_lpc_data *data = dev->driver_data; + struct gpio_mcux_lpc_data *data = dev->data; int i; GPIO_PortInit(config->gpio_base, config->port_no); @@ -378,7 +378,7 @@ static int lpc_gpio_0_init(struct device *dev) DT_INST_IRQ_HAS_IDX(0, 1) || \ DT_INST_IRQ_HAS_IDX(0, 2) || \ DT_INST_IRQ_HAS_IDX(0, 3) - struct gpio_mcux_lpc_data *data = dev->driver_data; + struct gpio_mcux_lpc_data *data = dev->data; #endif gpio_mcux_lpc_init(dev); @@ -452,7 +452,7 @@ static int lpc_gpio_1_init(struct device *dev) DT_INST_IRQ_HAS_IDX(1, 1) || \ DT_INST_IRQ_HAS_IDX(1, 2) || \ DT_INST_IRQ_HAS_IDX(1, 3) - struct gpio_mcux_lpc_data *data = dev->driver_data; + struct gpio_mcux_lpc_data *data = dev->data; #endif gpio_mcux_lpc_init(dev); diff --git a/drivers/gpio/gpio_mmio32.c b/drivers/gpio/gpio_mmio32.c index 3ab530a479a..71bfaba68e3 100644 --- a/drivers/gpio/gpio_mmio32.c +++ b/drivers/gpio/gpio_mmio32.c @@ -32,7 +32,7 @@ static int gpio_mmio32_config(struct device *dev, gpio_pin_t pin, gpio_flags_t flags) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; if ((config->mask & (1 << pin)) == 0) { @@ -64,7 +64,7 @@ static int gpio_mmio32_config(struct device *dev, static int gpio_mmio32_port_get_raw(struct device *dev, uint32_t *value) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; *value = *config->reg & config->mask; @@ -75,7 +75,7 @@ static int gpio_mmio32_port_get_raw(struct device *dev, uint32_t *value) static int gpio_mmio32_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; volatile uint32_t *reg = config->reg; unsigned int key; @@ -93,7 +93,7 @@ static int gpio_mmio32_port_set_masked_raw(struct device *dev, uint32_t mask, static int gpio_mmio32_port_set_bits_raw(struct device *dev, uint32_t mask) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; volatile uint32_t *reg = config->reg; unsigned int key; @@ -110,7 +110,7 @@ static int gpio_mmio32_port_set_bits_raw(struct device *dev, uint32_t mask) static int gpio_mmio32_port_clear_bits_raw(struct device *dev, uint32_t mask) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; volatile uint32_t *reg = config->reg; unsigned int key; @@ -127,7 +127,7 @@ static int gpio_mmio32_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_mmio32_port_toggle_bits(struct device *dev, uint32_t mask) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = context->config; volatile uint32_t *reg = config->reg; unsigned int key; @@ -165,11 +165,11 @@ static const struct gpio_driver_api gpio_mmio32_api = { int gpio_mmio32_init(struct device *dev) { - struct gpio_mmio32_context *context = dev->driver_data; + struct gpio_mmio32_context *context = dev->data; const struct gpio_mmio32_config *config = dev->config; context->config = config; - dev->driver_api = &gpio_mmio32_api; + dev->api = &gpio_mmio32_api; return 0; } diff --git a/drivers/gpio/gpio_nrfx.c b/drivers/gpio/gpio_nrfx.c index 0bcf915d495..cf06585c04f 100644 --- a/drivers/gpio/gpio_nrfx.c +++ b/drivers/gpio/gpio_nrfx.c @@ -37,7 +37,7 @@ struct gpio_nrfx_cfg { static inline struct gpio_nrfx_data *get_port_data(struct device *port) { - return port->driver_data; + return port->data; } static inline const struct gpio_nrfx_cfg *get_port_cfg(struct device *port) diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c index c051cc687d1..177e7904301 100644 --- a/drivers/gpio/gpio_pca95xx.c +++ b/drivers/gpio/gpio_pca95xx.c @@ -101,7 +101,7 @@ static int read_port_regs(struct device *dev, uint8_t reg, uint16_t *buf) { 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 gpio_pca95xx_drv_data * const)dev->data; struct device * const i2c_master = drv_data->i2c_master; uint16_t i2c_addr = config->i2c_slave_addr; uint16_t port_data; @@ -140,7 +140,7 @@ static int write_port_regs(struct device *dev, uint8_t reg, { 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 gpio_pca95xx_drv_data * const)dev->data; struct device * const i2c_master = drv_data->i2c_master; uint16_t i2c_addr = config->i2c_slave_addr; uint16_t port_data; @@ -167,7 +167,7 @@ static int write_port_regs(struct device *dev, uint8_t reg, static inline int update_output_regs(struct device *dev, uint16_t value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; return write_port_regs(dev, REG_OUTPUT_PORT0, &drv_data->reg_cache.output, value); @@ -176,7 +176,7 @@ static inline int update_output_regs(struct device *dev, uint16_t value) static inline int update_direction_regs(struct device *dev, uint16_t value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; return write_port_regs(dev, REG_CONF_PORT0, &drv_data->reg_cache.dir, value); @@ -185,7 +185,7 @@ static inline int update_direction_regs(struct device *dev, uint16_t value) static inline int update_pul_sel_regs(struct device *dev, uint16_t value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; return write_port_regs(dev, REG_PUD_SEL_PORT0, &drv_data->reg_cache.pud_sel, value); @@ -194,7 +194,7 @@ static inline int update_pul_sel_regs(struct device *dev, uint16_t value) static inline int update_pul_en_regs(struct device *dev, uint16_t value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; return write_port_regs(dev, REG_PUD_EN_PORT0, &drv_data->reg_cache.pud_en, value); @@ -212,7 +212,7 @@ static inline int update_pul_en_regs(struct device *dev, uint16_t value) static int setup_pin_dir(struct device *dev, uint32_t pin, int flags) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; uint16_t reg_dir = drv_data->reg_cache.dir; uint16_t reg_out = drv_data->reg_cache.output; int ret; @@ -252,7 +252,7 @@ static int setup_pin_pullupdown(struct device *dev, uint32_t pin, int flags) { 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 gpio_pca95xx_drv_data * const)dev->data; uint16_t reg_pud; int ret; @@ -310,7 +310,7 @@ static int gpio_pca95xx_config(struct device *dev, { int ret; struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; #if (CONFIG_GPIO_LOG_LEVEL >= LOG_LEVEL_DEBUG) const struct gpio_pca95xx_config * const config = dev->config; @@ -358,7 +358,7 @@ done: static int gpio_pca95xx_port_get_raw(struct device *dev, uint32_t *value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; uint16_t buf; int ret; @@ -385,7 +385,7 @@ static int gpio_pca95xx_port_set_masked_raw(struct device *dev, uint32_t mask, uint32_t value) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; uint16_t reg_out; int ret; @@ -419,7 +419,7 @@ static int gpio_pca95xx_port_clear_bits_raw(struct device *dev, uint32_t mask) static int gpio_pca95xx_port_toggle_bits(struct device *dev, uint32_t mask) { struct gpio_pca95xx_drv_data * const drv_data = - (struct gpio_pca95xx_drv_data * const)dev->driver_data; + (struct gpio_pca95xx_drv_data * const)dev->data; uint16_t reg_out; int ret; @@ -468,7 +468,7 @@ static int gpio_pca95xx_init(struct device *dev) { 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 gpio_pca95xx_drv_data * const)dev->data; struct device *i2c_master; /* Find out the device struct of the I2C master */ diff --git a/drivers/gpio/gpio_rv32m1.c b/drivers/gpio/gpio_rv32m1.c index 5d5d7559edd..a230c7207e4 100644 --- a/drivers/gpio/gpio_rv32m1.c +++ b/drivers/gpio/gpio_rv32m1.c @@ -232,7 +232,7 @@ static int gpio_rv32m1_pin_interrupt_configure(struct device *dev, static int gpio_rv32m1_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_rv32m1_data *data = dev->driver_data; + struct gpio_rv32m1_data *data = dev->data; gpio_manage_callback(&data->callbacks, callback, set); @@ -243,7 +243,7 @@ static void gpio_rv32m1_port_isr(void *arg) { struct device *dev = (struct device *)arg; const struct gpio_rv32m1_config *config = dev->config; - struct gpio_rv32m1_data *data = dev->driver_data; + struct gpio_rv32m1_data *data = dev->data; uint32_t int_status; int_status = config->port_base->ISFR; diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c index 3d4683b1048..ce63eb11469 100644 --- a/drivers/gpio/gpio_sam.c +++ b/drivers/gpio/gpio_sam.c @@ -34,7 +34,7 @@ struct gpio_sam_runtime { #define DEV_CFG(dev) \ ((const struct gpio_sam_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct gpio_sam_runtime * const)(dev)->driver_data) + ((struct gpio_sam_runtime * const)(dev)->data) #define GPIO_SAM_ALL_PINS 0xFFFFFFFF @@ -265,7 +265,7 @@ static void gpio_sam_isr(void *arg) struct device *dev = (struct device *)arg; const struct gpio_sam_config * const cfg = DEV_CFG(dev); Pio * const pio = cfg->regs; - struct gpio_sam_runtime *context = dev->driver_data; + struct gpio_sam_runtime *context = dev->data; uint32_t int_stat; int_stat = pio->PIO_ISR; @@ -277,7 +277,7 @@ static int gpio_sam_manage_callback(struct device *port, struct gpio_callback *callback, bool set) { - struct gpio_sam_runtime *context = port->driver_data; + struct gpio_sam_runtime *context = port->data; return gpio_manage_callback(&context->cb, callback, set); } diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c index 86472eb1507..58144ea4a24 100644 --- a/drivers/gpio/gpio_sam0.c +++ b/drivers/gpio/gpio_sam0.c @@ -40,7 +40,7 @@ struct gpio_sam0_data { #define DEV_CFG(dev) \ ((const struct gpio_sam0_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct gpio_sam0_data *const)(dev)->driver_data) + ((struct gpio_sam0_data *const)(dev)->data) #ifdef CONFIG_SAM0_EIC static void gpio_sam0_isr(uint32_t pins, void *arg) diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c index 6aceb02628f..8c232aca0ae 100644 --- a/drivers/gpio/gpio_sifive.c +++ b/drivers/gpio/gpio_sifive.c @@ -64,7 +64,7 @@ struct gpio_sifive_data { #define DEV_GPIO(dev) \ ((volatile struct gpio_sifive_t *)(DEV_GPIO_CFG(dev))->gpio_base_addr) #define DEV_GPIO_DATA(dev) \ - ((struct gpio_sifive_data *)(dev)->driver_data) + ((struct gpio_sifive_data *)(dev)->data) /* _irq_level and _level2_irq are copied from * soc/riscv/riscv-privileged/common/soc_common_irq.c diff --git a/drivers/gpio/gpio_stellaris.c b/drivers/gpio/gpio_stellaris.c index 4773afc258f..fd5c0a865c9 100644 --- a/drivers/gpio/gpio_stellaris.c +++ b/drivers/gpio/gpio_stellaris.c @@ -35,7 +35,7 @@ struct gpio_stellaris_runtime { #define DEV_DATA(dev) \ ((struct gpio_stellaris_runtime *const) \ - (dev)->driver_data) + (dev)->data) #define GPIO_REG_ADDR(base, offset) (base + offset) diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c index 8dcab1635eb..756ce430520 100644 --- a/drivers/gpio/gpio_stm32.c +++ b/drivers/gpio/gpio_stm32.c @@ -32,7 +32,7 @@ static void gpio_stm32_isr(int line, void *arg) { struct device *dev = arg; - struct gpio_stm32_data *data = dev->driver_data; + struct gpio_stm32_data *data = dev->data; gpio_fire_callbacks(&data->cb, dev, BIT(line)); } @@ -480,7 +480,7 @@ static int gpio_stm32_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct gpio_stm32_data *data = dev->driver_data; + struct gpio_stm32_data *data = dev->data; return gpio_manage_callback(&data->cb, callback, set); } diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c index ca7cc30eeb6..87219b7d200 100644 --- a/drivers/gpio/gpio_sx1509b.c +++ b/drivers/gpio/gpio_sx1509b.c @@ -178,7 +178,7 @@ static int sx1509b_handle_interrupt(void *arg) { struct device *dev = (struct device *) arg; const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; int ret = 0; uint16_t int_source; uint8_t cmd = SX1509B_REG_INTERRUPT_SOURCE; @@ -233,7 +233,7 @@ static int sx1509b_config(struct device *dev, gpio_flags_t flags) { const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; struct sx1509b_pin_state *pins = &drv_data->pin_state; struct { uint8_t reg; @@ -371,7 +371,7 @@ static int port_get(struct device *dev, gpio_port_value_t *value) { const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; uint16_t pin_data; int rc = 0; @@ -410,7 +410,7 @@ static int port_write(struct device *dev, } const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; uint16_t *outp = &drv_data->pin_state.data; k_sem_take(&drv_data->lock, K_FOREVER); @@ -474,7 +474,7 @@ static int pin_interrupt_configure(struct device *dev, } const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; struct sx1509b_irq_state *irq = &drv_data->irq_state; struct { uint8_t reg; @@ -533,7 +533,7 @@ static int pin_interrupt_configure(struct device *dev, static int sx1509b_init(struct device *dev) { const struct sx1509b_config *cfg = dev->config; - struct sx1509b_drv_data *drv_data = dev->driver_data; + struct sx1509b_drv_data *drv_data = dev->data; int rc; drv_data->i2c_master = device_get_binding(cfg->i2c_master_dev_name); @@ -628,7 +628,7 @@ static int gpio_sx1509b_manage_callback(struct device *dev, struct gpio_callback *callback, bool set) { - struct sx1509b_drv_data *data = dev->driver_data; + struct sx1509b_drv_data *data = dev->data; return gpio_manage_callback(&data->cb, callback, set); } diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index 4513ebdd588..271ab65ba97 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -46,7 +46,7 @@ struct i2c_cc13xx_cc26xx_config { static inline struct i2c_cc13xx_cc26xx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct i2c_cc13xx_cc26xx_config * diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c index e0ed492ba19..4c582e59f08 100644 --- a/drivers/i2c/i2c_cc32xx.c +++ b/drivers/i2c/i2c_cc32xx.c @@ -41,7 +41,7 @@ LOG_MODULE_REGISTER(i2c_cc32xx); #define DEV_CFG(dev) \ ((const struct i2c_cc32xx_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_cc32xx_data *const)(dev)->driver_data) + ((struct i2c_cc32xx_data *const)(dev)->data) #define DEV_BASE(dev) \ ((DEV_CFG(dev))->base) diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 63e7bfb0a7a..ed178bcbaaf 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -41,7 +41,7 @@ static inline volatile struct i2c_dw_registers *get_regs(struct device *dev) static inline void i2c_dw_data_ask(struct device *dev) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; uint32_t data; uint8_t tx_empty; int8_t rx_empty; @@ -98,7 +98,7 @@ static inline void i2c_dw_data_ask(struct device *dev) static void i2c_dw_data_read(struct device *dev) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; volatile struct i2c_dw_registers * const regs = get_regs(dev); @@ -124,7 +124,7 @@ static void i2c_dw_data_read(struct device *dev) static int i2c_dw_data_send(struct device *dev) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; uint32_t data = 0U; volatile struct i2c_dw_registers * const regs = get_regs(dev); @@ -168,7 +168,7 @@ static int i2c_dw_data_send(struct device *dev) static inline void i2c_dw_transfer_complete(struct device *dev) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; uint32_t value; volatile struct i2c_dw_registers * const regs = get_regs(dev); @@ -182,7 +182,7 @@ static inline void i2c_dw_transfer_complete(struct device *dev) static void i2c_dw_isr(void *arg) { struct device *port = (struct device *)arg; - struct i2c_dw_dev_config * const dw = port->driver_data; + struct i2c_dw_dev_config * const dw = port->data; union ic_interrupt_register intr_stat; uint32_t value; int ret = 0; @@ -262,7 +262,7 @@ done: static int i2c_dw_setup(struct device *dev, uint16_t slave_address) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; uint32_t value; union ic_con_register ic_con; volatile struct i2c_dw_registers * const regs = get_regs(dev); @@ -386,7 +386,7 @@ static int i2c_dw_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t slave_address) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; struct i2c_msg *cur_msg = msgs; uint8_t msg_left = num_msgs; uint8_t pflags; @@ -496,7 +496,7 @@ static int i2c_dw_transfer(struct device *dev, static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) { - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; uint32_t value = 0U; uint32_t rc = 0U; @@ -606,7 +606,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; - struct i2c_dw_dev_config * const dw = dev->driver_data; + struct i2c_dw_dev_config * const dw = dev->data; volatile struct i2c_dw_registers *regs; #ifdef I2C_DW_PCIE_ENABLED diff --git a/drivers/i2c/i2c_esp32.c b/drivers/i2c/i2c_esp32.c index 32f63b41e45..e1ce07e44c0 100644 --- a/drivers/i2c/i2c_esp32.c +++ b/drivers/i2c/i2c_esp32.c @@ -141,7 +141,7 @@ static int i2c_esp32_configure_speed(struct device *dev, }; const struct i2c_esp32_config *config = dev->config; - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->data; uint32_t sys_clk_freq = 0; uint32_t freq_hz = speed_to_freq_tbl[speed]; @@ -186,7 +186,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; - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->data; unsigned int key = irq_lock(); uint32_t v = 0U; int ret; @@ -294,7 +294,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; - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->data; uint32_t status; /* Start transmission and wait for the ISR to give the semaphore */ @@ -361,7 +361,7 @@ i2c_esp32_write_addr(struct device *dev, uint16_t addr) { const struct i2c_esp32_config *config = dev->config; - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->data; uint32_t addr_len = 1U; i2c_esp32_reset_fifo(config); @@ -522,7 +522,7 @@ static int i2c_esp32_write_msg(struct device *dev, uint16_t addr, static int i2c_esp32_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t addr) { - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->data; int ret = 0; uint8_t i; @@ -559,7 +559,7 @@ static void i2c_esp32_isr(void *arg) 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; + struct i2c_esp32_data *data = device->data; /* Only give the semaphore if a watched interrupt happens. * Error checking is performed at the other side of the @@ -674,7 +674,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; - struct i2c_esp32_data *data = dev->driver_data; + struct i2c_esp32_data *data = dev->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 b50c8df418e..d06f1ccf110 100644 --- a/drivers/i2c/i2c_gecko.c +++ b/drivers/i2c/i2c_gecko.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(i2c_gecko); #define DEV_CFG(dev) \ ((const struct i2c_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_gecko_data * const)(dev)->driver_data) + ((struct i2c_gecko_data * const)(dev)->data) #define DEV_BASE(dev) \ ((I2C_TypeDef *)(DEV_CFG(dev))->base) diff --git a/drivers/i2c/i2c_gpio.c b/drivers/i2c/i2c_gpio.c index 381b58d61d7..63b62abc91d 100644 --- a/drivers/i2c/i2c_gpio.c +++ b/drivers/i2c/i2c_gpio.c @@ -88,7 +88,7 @@ static const struct i2c_bitbang_io io_fns = { static int i2c_gpio_configure(struct device *dev, uint32_t dev_config) { - struct i2c_gpio_context *context = dev->driver_data; + struct i2c_gpio_context *context = dev->data; return i2c_bitbang_configure(&context->bitbang, dev_config); } @@ -96,7 +96,7 @@ static int i2c_gpio_configure(struct device *dev, uint32_t dev_config) static int i2c_gpio_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t slave_address) { - struct i2c_gpio_context *context = dev->driver_data; + struct i2c_gpio_context *context = dev->data; return i2c_bitbang_transfer(&context->bitbang, msgs, num_msgs, slave_address); @@ -104,7 +104,7 @@ static int i2c_gpio_transfer(struct device *dev, struct i2c_msg *msgs, static int i2c_gpio_recover_bus(struct device *dev) { - struct i2c_gpio_context *context = dev->driver_data; + struct i2c_gpio_context *context = dev->data; return i2c_bitbang_recover_bus(&context->bitbang); } @@ -117,7 +117,7 @@ static struct i2c_driver_api api = { static int i2c_gpio_init(struct device *dev) { - struct i2c_gpio_context *context = dev->driver_data; + struct i2c_gpio_context *context = dev->data; 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 594183763d0..4de12ac3d92 100644 --- a/drivers/i2c/i2c_imx.c +++ b/drivers/i2c/i2c_imx.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(i2c_imx); #define DEV_CFG(dev) \ ((const struct i2c_imx_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_imx_data * const)(dev)->driver_data) + ((struct i2c_imx_data * const)(dev)->data) #define DEV_BASE(dev) \ ((I2C_Type *)(DEV_CFG(dev))->base) diff --git a/drivers/i2c/i2c_litex.c b/drivers/i2c/i2c_litex.c index 2a7554a4627..e856b07578f 100644 --- a/drivers/i2c/i2c_litex.c +++ b/drivers/i2c/i2c_litex.c @@ -29,7 +29,7 @@ struct i2c_litex_cfg { ((const struct i2c_litex_cfg *) dev->config) #define GET_I2C_BITBANG(dev) \ - ((struct i2c_bitbang *) dev->driver_data) + ((struct i2c_bitbang *) dev->data) static inline void set_bit(volatile uint32_t *reg, uint32_t bit, uint32_t val) { diff --git a/drivers/i2c/i2c_ll_stm32.h b/drivers/i2c/i2c_ll_stm32.h index d64e8cad705..a0e77058083 100644 --- a/drivers/i2c/i2c_ll_stm32.h +++ b/drivers/i2c/i2c_ll_stm32.h @@ -69,7 +69,7 @@ int i2c_stm32_slave_unregister(struct device *dev, struct i2c_slave_config *config); #endif -#define DEV_DATA(dev) ((struct i2c_stm32_data * const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct i2c_stm32_data * const)(dev)->data) #define DEV_CFG(dev) \ ((const struct i2c_stm32_config * const)(dev)->config) diff --git a/drivers/i2c/i2c_lpc11u6x.c b/drivers/i2c/i2c_lpc11u6x.c index 4897a0a3715..c12d6aa2bdd 100644 --- a/drivers/i2c/i2c_lpc11u6x.c +++ b/drivers/i2c/i2c_lpc11u6x.c @@ -15,7 +15,7 @@ #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) +#define DEV_DATA(dev) ((dev)->data) static void lpc11u6x_i2c_set_bus_speed(const struct lpc11u6x_i2c_config *cfg, struct device *clk_dev, diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c index 2d024674269..ec4f199fe2b 100644 --- a/drivers/i2c/i2c_mchp_xec.c +++ b/drivers/i2c/i2c_mchp_xec.c @@ -231,7 +231,7 @@ static int i2c_xec_poll_write(struct device *dev, struct i2c_msg msg, const struct i2c_xec_config *config = (const struct i2c_xec_config *const) (dev->config); struct i2c_xec_data *data = - (struct i2c_xec_data *const) (dev->driver_data); + (struct i2c_xec_data *const) (dev->data); uint32_t ba = config->base_addr; int ret; @@ -294,7 +294,7 @@ static int i2c_xec_poll_read(struct device *dev, struct i2c_msg msg, const struct i2c_xec_config *config = (const struct i2c_xec_config *const) (dev->config); struct i2c_xec_data *data = - (struct i2c_xec_data *const) (dev->driver_data); + (struct i2c_xec_data *const) (dev->data); uint32_t ba = config->base_addr; uint8_t byte, ctrl; int ret; @@ -411,7 +411,7 @@ static const struct i2c_driver_api i2c_xec_driver_api = { static int i2c_xec_init(struct device *dev) { struct i2c_xec_data *data = - (struct i2c_xec_data *const) (dev->driver_data); + (struct i2c_xec_data *const) (dev->data); data->pending_stop = 0; return 0; } diff --git a/drivers/i2c/i2c_mcux.c b/drivers/i2c/i2c_mcux.c index 870bd4e65e3..dad084c73b7 100644 --- a/drivers/i2c/i2c_mcux.c +++ b/drivers/i2c/i2c_mcux.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(i2c_mcux); #define DEV_CFG(dev) \ ((const struct i2c_mcux_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_mcux_data * const)(dev)->driver_data) + ((struct i2c_mcux_data * const)(dev)->data) #define DEV_BASE(dev) \ ((I2C_Type *)(DEV_CFG(dev))->base) diff --git a/drivers/i2c/i2c_mcux_flexcomm.c b/drivers/i2c/i2c_mcux_flexcomm.c index 4c9194eaed7..d8c08dbef21 100644 --- a/drivers/i2c/i2c_mcux_flexcomm.c +++ b/drivers/i2c/i2c_mcux_flexcomm.c @@ -69,7 +69,7 @@ static void mcux_flexcomm_master_transfer_callback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; ARG_UNUSED(handle); ARG_UNUSED(base); @@ -97,7 +97,7 @@ 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; - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; I2C_Type *base = config->base; i2c_master_transfer_t transfer; status_t status; @@ -160,7 +160,7 @@ static void mcux_flexcomm_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_flexcomm_config *config = dev->config; - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; I2C_Type *base = config->base; I2C_MasterTransferHandleIRQ(base, &data->handle); @@ -169,7 +169,7 @@ static void mcux_flexcomm_isr(void *arg) static int mcux_flexcomm_init(struct device *dev) { const struct mcux_flexcomm_config *config = dev->config; - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; I2C_Type *base = config->base; uint32_t clock_freq, bitrate_cfg; i2c_master_config_t master_config; diff --git a/drivers/i2c/i2c_mcux_lpi2c.c b/drivers/i2c/i2c_mcux_lpi2c.c index 2acee5111dc..8c98e8fc36d 100644 --- a/drivers/i2c/i2c_mcux_lpi2c.c +++ b/drivers/i2c/i2c_mcux_lpi2c.c @@ -81,7 +81,7 @@ static void mcux_lpi2c_master_transfer_callback(LPI2C_Type *base, lpi2c_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct mcux_lpi2c_data *data = dev->driver_data; + struct mcux_lpi2c_data *data = dev->data; ARG_UNUSED(handle); ARG_UNUSED(base); @@ -109,7 +109,7 @@ 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; - struct mcux_lpi2c_data *data = dev->driver_data; + struct mcux_lpi2c_data *data = dev->data; LPI2C_Type *base = config->base; lpi2c_master_transfer_t transfer; status_t status; @@ -172,7 +172,7 @@ static void mcux_lpi2c_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_lpi2c_config *config = dev->config; - struct mcux_lpi2c_data *data = dev->driver_data; + struct mcux_lpi2c_data *data = dev->data; LPI2C_Type *base = config->base; LPI2C_MasterTransferHandleIRQ(base, &data->handle); @@ -181,7 +181,7 @@ static void mcux_lpi2c_isr(void *arg) static int mcux_lpi2c_init(struct device *dev) { const struct mcux_lpi2c_config *config = dev->config; - struct mcux_lpi2c_data *data = dev->driver_data; + struct mcux_lpi2c_data *data = dev->data; LPI2C_Type *base = config->base; struct device *clock_dev; uint32_t clock_freq, bitrate_cfg; diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 7bdd84689b5..cf10977d327 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -31,7 +31,7 @@ struct i2c_nrfx_twi_config { static inline struct i2c_nrfx_twi_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 36014a05927..d0cb7d1aeea 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -34,7 +34,7 @@ struct i2c_nrfx_twim_config { static inline struct i2c_nrfx_twim_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline diff --git a/drivers/i2c/i2c_rv32m1_lpi2c.c b/drivers/i2c/i2c_rv32m1_lpi2c.c index 20bae7a7384..1c11284e090 100644 --- a/drivers/i2c/i2c_rv32m1_lpi2c.c +++ b/drivers/i2c/i2c_rv32m1_lpi2c.c @@ -102,7 +102,7 @@ static void rv32m1_lpi2c_master_transfer_callback(LPI2C_Type *base, void *userData) { struct device *dev = userData; - struct rv32m1_lpi2c_data *data = dev->driver_data; + struct rv32m1_lpi2c_data *data = dev->data; ARG_UNUSED(base); ARG_UNUSED(handle); @@ -130,7 +130,7 @@ 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; - struct rv32m1_lpi2c_data *data = dev->driver_data; + struct rv32m1_lpi2c_data *data = dev->data; lpi2c_master_transfer_t transfer; status_t status; int ret = 0; @@ -203,7 +203,7 @@ static void rv32m1_lpi2c_isr(void *arg) { struct device *dev = (struct device *)arg; const struct rv32m1_lpi2c_config *config = dev->config; - struct rv32m1_lpi2c_data *data = dev->driver_data; + struct rv32m1_lpi2c_data *data = dev->data; LPI2C_MasterTransferHandleIRQ(config->base, &data->handle); } @@ -211,7 +211,7 @@ static void rv32m1_lpi2c_isr(void *arg) static int rv32m1_lpi2c_init(struct device *dev) { const struct rv32m1_lpi2c_config *config = dev->config; - struct rv32m1_lpi2c_data *data = dev->driver_data; + struct rv32m1_lpi2c_data *data = dev->data; lpi2c_master_config_t master_config; struct device *clk; uint32_t clk_freq, dev_cfg; diff --git a/drivers/i2c/i2c_sam0.c b/drivers/i2c/i2c_sam0.c index 5fe5b17a8a2..25a31bc5796 100644 --- a/drivers/i2c/i2c_sam0.c +++ b/drivers/i2c/i2c_sam0.c @@ -62,7 +62,7 @@ struct i2c_sam0_dev_data { #define DEV_CFG(dev) \ ((const struct i2c_sam0_dev_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_sam0_dev_data *const)(dev)->driver_data) + ((struct i2c_sam0_dev_data *const)(dev)->data) static void wait_synchronization(SercomI2cm *regs) { diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c index b5c4646e791..80a6731e39a 100644 --- a/drivers/i2c/i2c_sam_twi.c +++ b/drivers/i2c/i2c_sam_twi.c @@ -70,7 +70,7 @@ struct i2c_sam_twi_dev_data { #define DEV_CFG(dev) \ ((const struct i2c_sam_twi_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_sam_twi_dev_data *const)(dev)->driver_data) + ((struct i2c_sam_twi_dev_data *const)(dev)->data) static int i2c_clk_set(Twi *const twi, uint32_t speed) { diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c index f7d2513966a..038fa4cbf08 100644 --- a/drivers/i2c/i2c_sam_twihs.c +++ b/drivers/i2c/i2c_sam_twihs.c @@ -70,7 +70,7 @@ struct i2c_sam_twihs_dev_data { #define DEV_CFG(dev) \ ((const struct i2c_sam_twihs_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_sam_twihs_dev_data *const)(dev)->driver_data) + ((struct i2c_sam_twihs_dev_data *const)(dev)->data) static int i2c_clk_set(Twihs *const twihs, uint32_t speed) { diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c index 84d73a73a7c..cc738ae9da4 100644 --- a/drivers/i2c/i2c_sbcon.c +++ b/drivers/i2c/i2c_sbcon.c @@ -79,7 +79,7 @@ static const struct i2c_bitbang_io io_fns = { static int i2c_sbcon_configure(struct device *dev, uint32_t dev_config) { - struct i2c_sbcon_context *context = dev->driver_data; + struct i2c_sbcon_context *context = dev->data; return i2c_bitbang_configure(&context->bitbang, dev_config); } @@ -87,7 +87,7 @@ static int i2c_sbcon_configure(struct device *dev, uint32_t dev_config) static int i2c_sbcon_transfer(struct device *dev, struct i2c_msg *msgs, uint8_t num_msgs, uint16_t slave_address) { - struct i2c_sbcon_context *context = dev->driver_data; + struct i2c_sbcon_context *context = dev->data; return i2c_bitbang_transfer(&context->bitbang, msgs, num_msgs, slave_address); @@ -100,7 +100,7 @@ static struct i2c_driver_api api = { static int i2c_sbcon_init(struct device *dev) { - struct i2c_sbcon_context *context = dev->driver_data; + struct i2c_sbcon_context *context = dev->data; const struct i2c_sbcon_config *config = dev->config; i2c_bitbang_init(&context->bitbang, &io_fns, config->sbcon); diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c index b60c06fe4b3..0d5487b0501 100644 --- a/drivers/i2c/slave/eeprom_slave.c +++ b/drivers/i2c/slave/eeprom_slave.c @@ -38,12 +38,12 @@ struct i2c_eeprom_slave_config { ((const struct i2c_eeprom_slave_config * const) \ (dev)->config) #define DEV_DATA(dev) \ - ((struct i2c_eeprom_slave_data * const)(dev)->driver_data) + ((struct i2c_eeprom_slave_data * const)(dev)->data) int eeprom_slave_program(struct device *dev, const uint8_t *eeprom_data, unsigned int length) { - struct i2c_eeprom_slave_data *data = dev->driver_data; + struct i2c_eeprom_slave_data *data = dev->data; if (length > data->buffer_size) { return -EINVAL; @@ -57,7 +57,7 @@ int eeprom_slave_program(struct device *dev, const uint8_t *eeprom_data, int eeprom_slave_read(struct device *dev, uint8_t *eeprom_data, unsigned int offset) { - struct i2c_eeprom_slave_data *data = dev->driver_data; + struct i2c_eeprom_slave_data *data = dev->data; if (!data || offset >= data->buffer_size) { return -EINVAL; @@ -159,14 +159,14 @@ static int eeprom_slave_stop(struct i2c_slave_config *config) static int eeprom_slave_register(struct device *dev) { - struct i2c_eeprom_slave_data *data = dev->driver_data; + struct i2c_eeprom_slave_data *data = dev->data; return i2c_slave_register(data->i2c_controller, &data->config); } static int eeprom_slave_unregister(struct device *dev) { - struct i2c_eeprom_slave_data *data = dev->driver_data; + struct i2c_eeprom_slave_data *data = dev->data; return i2c_slave_unregister(data->i2c_controller, &data->config); } diff --git a/drivers/i2s/i2s_cavs.c b/drivers/i2s/i2s_cavs.c index b3ad2ecb4c3..b433cfebc18 100644 --- a/drivers/i2s/i2s_cavs.c +++ b/drivers/i2s/i2s_cavs.c @@ -160,7 +160,7 @@ struct i2s_cavs_dev_data { #define DEV_CFG(dev) \ ((const struct i2s_cavs_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2s_cavs_dev_data *const)(dev)->driver_data) + ((struct i2s_cavs_dev_data *const)(dev)->data) I2S_DEVICE_OBJECT_DECLARE(1); I2S_DEVICE_OBJECT_DECLARE(2); diff --git a/drivers/i2s/i2s_ll_stm32.h b/drivers/i2s/i2s_ll_stm32.h index 5dca64107be..9245b577ac9 100644 --- a/drivers/i2s/i2s_ll_stm32.h +++ b/drivers/i2s/i2s_ll_stm32.h @@ -52,7 +52,7 @@ #define DEV_CFG(dev) \ (const struct i2s_stm32_cfg * const)((dev)->config) #define DEV_DATA(dev) \ - ((struct i2s_stm32_data *const)(dev)->driver_data) + ((struct i2s_stm32_data *const)(dev)->data) struct queue_item { void *mem_block; diff --git a/drivers/i2s/i2s_sam_ssc.c b/drivers/i2s/i2s_sam_ssc.c index 68cea1810d4..3fa823763c2 100644 --- a/drivers/i2s/i2s_sam_ssc.c +++ b/drivers/i2s/i2s_sam_ssc.c @@ -99,7 +99,7 @@ struct i2s_sam_dev_data { #define DEV_CFG(dev) \ ((const struct i2s_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct i2s_sam_dev_data *const)(dev)->driver_data) + ((struct i2s_sam_dev_data *const)(dev)->data) #define MODULO_INC(val, max) { val = (++val < max) ? val : 0; } diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c index 3bdd7c2461d..d5bbe4ac64d 100644 --- a/drivers/ieee802154/ieee802154_cc1200.c +++ b/drivers/ieee802154/ieee802154_cc1200.c @@ -136,7 +136,7 @@ bool z_cc1200_access_reg(struct cc1200_context *ctx, bool read, uint8_t addr, static inline uint8_t *get_mac(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; #if defined(CONFIG_IEEE802154_CC1200_RANDOM_MAC) uint32_t *ptr = (uint32_t *)(cc1200->mac_addr + 4); @@ -211,7 +211,7 @@ static void enable_gpio0_interrupt(struct cc1200_context *cc1200, bool enable) static void setup_gpio_callback(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; gpio_init_callback(&cc1200->rx_tx_cb, gpio0_int_handler, BIT(cc1200->gpios[CC1200_GPIO_IDX_GPIO0].pin)); @@ -325,7 +325,7 @@ static bool rf_install_settings(struct device *dev, const struct cc1200_rf_registers_set *rf_settings) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; if (!z_cc1200_access_reg(cc1200, false, CC1200_REG_SYNC3, (void *)rf_settings->registers, @@ -450,7 +450,7 @@ static inline bool verify_crc(struct cc1200_context *ctx, struct net_pkt *pkt) static void cc1200_rx(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; struct net_pkt *pkt; uint8_t pkt_len; @@ -525,7 +525,7 @@ static enum ieee802154_hw_caps cc1200_get_capabilities(struct device *dev) static int cc1200_cca(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; if (atomic_get(&cc1200->rx) == 0) { uint8_t status = read_reg_rssi0(cc1200); @@ -543,7 +543,7 @@ static int cc1200_cca(struct device *dev) static int cc1200_set_channel(struct device *dev, uint16_t channel) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; /* Unlike usual 15.4 chips, cc1200 is closer to a bare metal radio modem * and thus does not provide any means to select a channel directly, but @@ -568,7 +568,7 @@ static int cc1200_set_channel(struct device *dev, uint16_t channel) static int cc1200_set_txpower(struct device *dev, int16_t dbm) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; uint8_t pa_power_ramp; LOG_DBG("%d dbm", dbm); @@ -596,7 +596,7 @@ static int cc1200_tx(struct device *dev, struct net_pkt *pkt, struct net_buf *frag) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; uint8_t *frame = frag->data; uint8_t len = frag->len; bool status = false; @@ -667,7 +667,7 @@ out: static int cc1200_start(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; if (!instruct_sidle(cc1200) || !instruct_sftx(cc1200) || @@ -686,7 +686,7 @@ static int cc1200_start(struct device *dev) static int cc1200_stop(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; enable_gpio0_interrupt(cc1200, false); @@ -700,7 +700,7 @@ static int cc1200_stop(struct device *dev) static uint16_t cc1200_get_channel_count(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; return cc1200->rf_settings->channel_limit; } @@ -711,7 +711,7 @@ static uint16_t cc1200_get_channel_count(struct device *dev) static int power_on_and_setup(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; if (!instruct_sres(cc1200)) { LOG_ERR("Cannot reset"); @@ -736,7 +736,7 @@ static int power_on_and_setup(struct device *dev) static struct cc1200_gpio_configuration *configure_gpios(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; struct device *gpio = device_get_binding(DT_INST_GPIO_LABEL(0, int_gpios)); if (!gpio) { @@ -753,7 +753,7 @@ static struct cc1200_gpio_configuration *configure_gpios(struct device *dev) static int configure_spi(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; cc1200->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!cc1200->spi) { @@ -789,7 +789,7 @@ static int configure_spi(struct device *dev) static int cc1200_init(struct device *dev) { - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; atomic_set(&cc1200->tx, 0); atomic_set(&cc1200->tx_start, 0); @@ -828,7 +828,7 @@ static int cc1200_init(struct device *dev) static void cc1200_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct cc1200_context *cc1200 = dev->driver_data; + struct cc1200_context *cc1200 = dev->data; uint8_t *mac = get_mac(dev); LOG_DBG(""); diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c index 6428070b782..b0961ad4dff 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c @@ -48,7 +48,7 @@ static HwiP_Struct RF_hwiCpe0Obj; static inline struct ieee802154_cc13xx_cc26xx_data * get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static enum ieee802154_hw_caps diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index 902f404af28..71dda74a10c 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -69,7 +69,7 @@ static struct spi_cs_control cs_ctrl; #if LOG_LEVEL == LOG_LEVEL_DBG static inline void cc2520_print_gpio_config(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; LOG_DBG("GPIOCTRL0/1/2/3/4/5 = 0x%x/0x%x/0x%x/0x%x/0x%x/0x%x", read_reg_gpioctrl0(cc2520), @@ -279,7 +279,7 @@ static bool verify_osc_stabilization(struct cc2520_context *cc2520) static inline uint8_t *get_mac(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; #if defined(CONFIG_IEEE802154_CC2520_RANDOM_MAC) uint32_t *ptr = (uint32_t *)(cc2520->mac_addr + 4); @@ -304,7 +304,7 @@ static inline uint8_t *get_mac(struct device *dev) static int cc2520_set_pan_id(struct device *dev, uint16_t pan_id) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; LOG_DBG("0x%x", pan_id); @@ -320,7 +320,7 @@ static int cc2520_set_pan_id(struct device *dev, uint16_t pan_id) static int cc2520_set_short_addr(struct device *dev, uint16_t short_addr) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; LOG_DBG("0x%x", short_addr); @@ -336,7 +336,7 @@ static int cc2520_set_short_addr(struct device *dev, uint16_t short_addr) static int cc2520_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; if (!write_mem_ext_addr(cc2520, (void *)ieee_addr)) { LOG_ERR("Failed"); @@ -355,7 +355,7 @@ static int cc2520_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr) *****************/ static inline void set_reset(struct device *dev, uint32_t value) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; gpio_pin_set_raw(cc2520->gpios[CC2520_GPIO_IDX_RESET].dev, cc2520->gpios[CC2520_GPIO_IDX_RESET].pin, value); @@ -363,7 +363,7 @@ static inline void set_reset(struct device *dev, uint32_t value) static inline void set_vreg_en(struct device *dev, uint32_t value) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; gpio_pin_set_raw(cc2520->gpios[CC2520_GPIO_IDX_VREG_EN].dev, cc2520->gpios[CC2520_GPIO_IDX_VREG_EN].pin, value); @@ -449,7 +449,7 @@ static void enable_sfd_interrupt(struct cc2520_context *cc2520, static inline void setup_gpio_callbacks(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; gpio_init_callback(&cc2520->sfd_cb, sfd_int_handler, BIT(cc2520->gpios[CC2520_GPIO_IDX_SFD].pin)); @@ -608,7 +608,7 @@ static inline bool verify_rxfifo_validity(struct cc2520_context *ctx, static void cc2520_rx(int arg) { struct device *dev = INT_TO_POINTER(arg); - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; struct net_pkt *pkt; uint8_t pkt_len; @@ -689,7 +689,7 @@ static enum ieee802154_hw_caps cc2520_get_capabilities(struct device *dev) static int cc2520_cca(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; if (!get_cca(cc2520)) { LOG_WRN("Busy"); @@ -701,7 +701,7 @@ static int cc2520_cca(struct device *dev) static int cc2520_set_channel(struct device *dev, uint16_t channel) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; LOG_DBG("%u", channel); @@ -744,7 +744,7 @@ static int cc2520_filter(struct device *dev, static int cc2520_set_txpower(struct device *dev, int16_t dbm) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; uint8_t pwr; LOG_DBG("%d", dbm); @@ -799,7 +799,7 @@ static int cc2520_tx(struct device *dev, { uint8_t *frame = frag->data; uint8_t len = frag->len; - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; uint8_t retry = 2U; bool status; @@ -866,7 +866,7 @@ error: static int cc2520_start(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; if (!instruct_sxoscon(cc2520) || !instruct_srxon(cc2520) || @@ -885,7 +885,7 @@ static int cc2520_start(struct device *dev) static int cc2520_stop(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; flush_rxfifo(cc2520); @@ -906,7 +906,7 @@ static int cc2520_stop(struct device *dev) *****************/ static int power_on_and_setup(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; /* Switching to LPM2 mode */ set_reset(dev, 0); @@ -972,7 +972,7 @@ static int power_on_and_setup(struct device *dev) static struct cc2520_gpio_configuration *configure_gpios(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; struct device *gpio; /* VREG_EN */ @@ -1047,7 +1047,7 @@ static struct cc2520_gpio_configuration *configure_gpios(struct device *dev) static inline int configure_spi(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; cc2520->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!cc2520->spi) { @@ -1083,7 +1083,7 @@ static inline int configure_spi(struct device *dev) static int cc2520_init(struct device *dev) { - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; atomic_set(&cc2520->tx, 0); k_sem_init(&cc2520->rx_lock, 0, UINT_MAX); @@ -1123,7 +1123,7 @@ static int cc2520_init(struct device *dev) static void cc2520_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct cc2520_context *cc2520 = dev->driver_data; + struct cc2520_context *cc2520 = dev->data; uint8_t *mac = get_mac(dev); net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); @@ -1251,7 +1251,7 @@ static int insert_crypto_parameters(struct cipher_ctx *ctx, struct cipher_aead_pkt *apkt, uint8_t *ccm_nonce, uint8_t *auth_crypt) { - struct cc2520_context *cc2520 = ctx->device->driver_data; + struct cc2520_context *cc2520 = ctx->device->data; uint8_t data[128]; uint8_t *in_buf; uint8_t in_len; @@ -1342,7 +1342,7 @@ static int cc2520_crypto_ccm(struct cipher_ctx *ctx, struct cipher_aead_pkt *apkt, uint8_t *ccm_nonce) { - struct cc2520_context *cc2520 = ctx->device->driver_data; + struct cc2520_context *cc2520 = ctx->device->data; uint8_t auth_crypt; int m; @@ -1387,7 +1387,7 @@ static int cc2520_crypto_uccm(struct cipher_ctx *ctx, struct cipher_aead_pkt *apkt, uint8_t *ccm_nonce) { - struct cc2520_context *cc2520 = ctx->device->driver_data; + struct cc2520_context *cc2520 = ctx->device->data; uint8_t auth_crypt; int m; diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c index 2f28a1ec546..57a7df01f66 100644 --- a/drivers/ieee802154/ieee802154_dw1000.c +++ b/drivers/ieee802154/ieee802154_dw1000.c @@ -652,7 +652,7 @@ static uint32_t dwt_get_pkt_duration_ns(struct dwt_context *ctx, uint8_t psdu_le static int dwt_cca(struct device *dev) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; uint32_t cca_dur = (dwt_get_pkt_duration_ns(ctx, 127) + dwt_get_pkt_duration_ns(ctx, 5)) / UWB_PHY_TDSYM_PHR_6M8; @@ -693,7 +693,7 @@ static int dwt_ed(struct device *dev, uint16_t duration, static int dwt_set_channel(struct device *dev, uint16_t channel) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; struct dwt_phy_config *rf_cfg = &ctx->rf_cfg; rf_cfg->channel = channel; @@ -715,7 +715,7 @@ static int dwt_set_channel(struct device *dev, uint16_t channel) static int dwt_set_pan_id(struct device *dev, uint16_t pan_id) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; k_sem_take(&ctx->dev_lock, K_FOREVER); dwt_reg_write_u16(ctx, DWT_PANADR_ID, DWT_PANADR_PAN_ID_OFFSET, pan_id); @@ -728,7 +728,7 @@ static int dwt_set_pan_id(struct device *dev, uint16_t pan_id) static int dwt_set_short_addr(struct device *dev, uint16_t short_addr) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; k_sem_take(&ctx->dev_lock, K_FOREVER); dwt_reg_write_u16(ctx, DWT_PANADR_ID, DWT_PANADR_SHORT_ADDR_OFFSET, @@ -742,7 +742,7 @@ static int dwt_set_short_addr(struct device *dev, uint16_t short_addr) static int dwt_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; LOG_INF("IEEE address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", ieee_addr[7], ieee_addr[6], ieee_addr[5], ieee_addr[4], @@ -778,7 +778,7 @@ static int dwt_filter(struct device *dev, static int dwt_set_power(struct device *dev, int16_t dbm) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; LOG_INF("set_txpower not supported %p", ctx); @@ -788,7 +788,7 @@ static int dwt_set_power(struct device *dev, int16_t dbm) static int dwt_tx(struct device *dev, enum ieee802154_tx_mode tx_mode, struct net_pkt *pkt, struct net_buf *frag) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; size_t len = frag->len; uint32_t tx_time = 0; struct net_ptp_time *txts; @@ -918,7 +918,7 @@ static void dwt_set_frame_filter(struct dwt_context *ctx, static int dwt_configure(struct device *dev, enum ieee802154_config_type type, const struct ieee802154_config *config) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; LOG_DBG("API configure %p", ctx); @@ -955,7 +955,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; + struct dwt_context *ctx = dev->data; const struct dwt_hi_cfg *hi_cfg = dev->config; if (gpio_pin_configure(ctx->rst_gpio, hi_cfg->rst_pin, @@ -1020,7 +1020,7 @@ static void dwt_set_rx_mode(struct dwt_context *ctx) static int dwt_start(struct device *dev) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; uint8_t cswakeup_buf[32] = {0}; k_sem_take(&ctx->dev_lock, K_FOREVER); @@ -1068,7 +1068,7 @@ static int dwt_start(struct device *dev) static int dwt_stop(struct device *dev) { - struct dwt_context *ctx = dev->driver_data; + struct dwt_context *ctx = dev->data; k_sem_take(&ctx->dev_lock, K_FOREVER); dwt_disable_txrx(ctx); @@ -1489,7 +1489,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; + struct dwt_context *ctx = dev->data; const struct dwt_hi_cfg *hi_cfg = dev->config; LOG_INF("Initialize DW1000 Transceiver"); @@ -1621,7 +1621,7 @@ static int dw1000_init(struct device *dev) static inline uint8_t *get_mac(struct device *dev) { - struct dwt_context *dw1000 = dev->driver_data; + struct dwt_context *dw1000 = dev->data; uint32_t *ptr = (uint32_t *)(dw1000->mac_addr); UNALIGNED_PUT(sys_rand32_get(), ptr); @@ -1636,7 +1636,7 @@ static inline uint8_t *get_mac(struct device *dev) static void dwt_iface_api_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct dwt_context *dw1000 = dev->driver_data; + struct dwt_context *dw1000 = dev->data; uint8_t *mac = get_mac(dev); net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c index 4e86f22c64d..731792d5bcb 100644 --- a/drivers/ieee802154/ieee802154_kw41z.c +++ b/drivers/ieee802154/ieee802154_kw41z.c @@ -366,7 +366,7 @@ static enum ieee802154_hw_caps kw41z_get_capabilities(struct device *dev) static int kw41z_cca(struct device *dev) { - struct kw41z_context *kw41z = dev->driver_data; + struct kw41z_context *kw41z = dev->data; kw41z_phy_abort(); @@ -615,7 +615,7 @@ out: static int kw41z_tx(struct device *dev, enum ieee802154_tx_mode mode, struct net_pkt *pkt, struct net_buf *frag) { - struct kw41z_context *kw41z = dev->driver_data; + struct kw41z_context *kw41z = dev->data; uint8_t payload_len = frag->len; uint32_t tx_timeout; uint8_t xcvseq; @@ -926,7 +926,7 @@ static void kw41z_isr(int unused) static inline uint8_t *get_mac(struct device *dev) { - struct kw41z_context *kw41z = dev->driver_data; + struct kw41z_context *kw41z = dev->data; /* * The KW40Z has two 32-bit registers for the MAC address where @@ -957,7 +957,7 @@ static inline uint8_t *get_mac(struct device *dev) static int kw41z_init(struct device *dev) { - struct kw41z_context *kw41z = dev->driver_data; + struct kw41z_context *kw41z = dev->data; xcvrStatus_t xcvrStatus; xcvrStatus = XCVR_Init(ZIGBEE_MODE, DR_500KBPS); @@ -1063,7 +1063,7 @@ static int kw41z_init(struct device *dev) static void kw41z_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct kw41z_context *kw41z = dev->driver_data; + struct kw41z_context *kw41z = dev->data; uint8_t *mac = get_mac(dev); #if defined(CONFIG_KW41_DBG_TRACE) diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c index de7d096fd4c..a09871dbd0b 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.c +++ b/drivers/ieee802154/ieee802154_mcr20a.c @@ -325,7 +325,7 @@ error: static int mcr20a_timer_init(struct device *dev, uint8_t tb) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t buf[3] = {0, 0, 0}; uint8_t ctrl4; @@ -501,7 +501,7 @@ static inline uint32_t mcr20a_get_rssi(uint32_t lqi) static inline uint8_t *get_mac(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint32_t *ptr = (uint32_t *)(mcr20a->mac_addr); UNALIGNED_PUT(sys_rand32_get(), ptr); @@ -713,7 +713,7 @@ static inline bool irqsts3_event(struct mcr20a_context *mcr20a, static void mcr20a_thread_main(void *arg) { struct device *dev = (struct device *)arg; - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t dregs[MCR20A_PHY_CTRL4 + 1]; bool set_new_seq; uint8_t ctrl1 = 0U; @@ -816,7 +816,7 @@ static inline void setup_gpio_callbacks(struct mcr20a_context *mcr20a) static int mcr20a_set_cca_mode(struct device *dev, uint8_t mode) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t ctrl4; ctrl4 = read_reg_phy_ctrl4(mcr20a); @@ -842,7 +842,7 @@ static enum ieee802154_hw_caps mcr20a_get_capabilities(struct device *dev) /* Note: CCA before TX is enabled by default */ static int mcr20a_cca(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; int retval; k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -890,7 +890,7 @@ error: static int mcr20a_set_channel(struct device *dev, uint16_t channel) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t buf[3]; uint8_t ctrl1; int retval = -EIO; @@ -945,7 +945,7 @@ out: static int mcr20a_set_pan_id(struct device *dev, uint16_t pan_id) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; pan_id = sys_le16_to_cpu(pan_id); k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -964,7 +964,7 @@ static int mcr20a_set_pan_id(struct device *dev, uint16_t pan_id) static int mcr20a_set_short_addr(struct device *dev, uint16_t short_addr) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; short_addr = sys_le16_to_cpu(short_addr); k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -983,7 +983,7 @@ static int mcr20a_set_short_addr(struct device *dev, uint16_t short_addr) static int mcr20a_set_ieee_addr(struct device *dev, const uint8_t *ieee_addr) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -1025,7 +1025,7 @@ static int mcr20a_filter(struct device *dev, static int mcr20a_set_txpower(struct device *dev, int16_t dbm) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t pwr; k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -1087,7 +1087,7 @@ static int mcr20a_tx(struct device *dev, struct net_pkt *pkt, struct net_buf *frag) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t seq = ieee802154_is_ar_flag_set(frag) ? MCR20A_XCVSEQ_TX_RX : MCR20A_XCVSEQ_TX; int retval; @@ -1147,7 +1147,7 @@ error: static int mcr20a_start(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t timeout = 6U; uint8_t status; @@ -1205,7 +1205,7 @@ error: static int mcr20a_stop(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t power_mode; k_mutex_lock(&mcr20a->phy_mutex, K_FOREVER); @@ -1269,7 +1269,7 @@ error: static int power_on_and_setup(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t timeout = 6U; int pin; uint8_t tmp = 0U; @@ -1335,7 +1335,7 @@ static int power_on_and_setup(struct device *dev) static inline int configure_gpios(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; /* setup gpio for the modem interrupt */ mcr20a->irq_gpio = @@ -1372,7 +1372,7 @@ static inline int configure_gpios(struct device *dev) static inline int configure_spi(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; mcr20a->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!mcr20a->spi) { @@ -1412,7 +1412,7 @@ static inline int configure_spi(struct device *dev) static int mcr20a_init(struct device *dev) { - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; k_mutex_init(&mcr20a->phy_mutex); k_sem_init(&mcr20a->isr_sem, 0, 1); @@ -1448,7 +1448,7 @@ static int mcr20a_init(struct device *dev) static void mcr20a_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct mcr20a_context *mcr20a = dev->driver_data; + struct mcr20a_context *mcr20a = dev->data; uint8_t *mac = get_mac(dev); net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c index b58bff50d4b..98c24b641da 100644 --- a/drivers/ieee802154/ieee802154_nrf5.c +++ b/drivers/ieee802154/ieee802154_nrf5.c @@ -55,7 +55,7 @@ static struct nrf5_802154_data nrf5_data; /* Convenience defines for RADIO */ #define NRF5_802154_DATA(dev) \ - ((struct nrf5_802154_data * const)(dev)->driver_data) + ((struct nrf5_802154_data * const)(dev)->data) #define NRF5_802154_CFG(dev) \ ((const struct nrf5_802154_config * const)(dev)->config) diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c index 30194a35580..29e3891bd12 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.c +++ b/drivers/ieee802154/ieee802154_rf2xx.c @@ -178,7 +178,7 @@ static void rf2xx_trx_set_rx_state(struct device *dev) static void rf2xx_trx_rx(struct device *dev) { - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; struct net_pkt *pkt = NULL; uint8_t rx_buf[RX2XX_MAX_FRAME_SIZE]; uint8_t pkt_len; @@ -256,7 +256,7 @@ static void rf2xx_trx_rx(struct device *dev) static void rf2xx_process_rx_frame(struct device *dev) { - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; if (ctx->trx_model != RF2XX_TRX_MODEL_231) { rf2xx_trx_rx(dev); @@ -280,7 +280,7 @@ static void rf2xx_process_rx_frame(struct device *dev) static void rf2xx_process_tx_frame(struct device *dev) { - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; ctx->trx_trac = (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATE_REG) >> RF2XX_TRAC_STATUS) & 7; @@ -303,7 +303,7 @@ static void rf2xx_process_trx_end(struct device *dev) static void rf2xx_thread_main(void *arg) { struct device *dev = INT_TO_POINTER(arg); - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; uint8_t isr_status; while (true) { @@ -350,7 +350,7 @@ static void rf2xx_thread_main(void *arg) static inline uint8_t *get_mac(struct device *dev) { const struct rf2xx_config *conf = dev->config; - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; uint32_t *ptr = (uint32_t *)(ctx->mac_addr); if (!conf->has_mac) { @@ -533,7 +533,7 @@ static int rf2xx_tx(struct device *dev, { ARG_UNUSED(pkt); - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; int response = 0; if (mode != IEEE802154_TX_MODE_CSMA_CA) { @@ -586,7 +586,7 @@ static int rf2xx_tx(struct device *dev, static int rf2xx_start(struct device *dev) { const struct rf2xx_config *conf = dev->config; - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TRX_OFF); rf2xx_iface_reg_read(dev, RF2XX_IRQ_STATUS_REG); @@ -600,7 +600,7 @@ static int rf2xx_start(struct device *dev) static int rf2xx_stop(struct device *dev) { const struct rf2xx_config *conf = dev->config; - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; gpio_pin_interrupt_configure(ctx->irq_gpio, conf->irq.pin, GPIO_INT_DISABLE); @@ -623,7 +623,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; - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; uint8_t config; rf2xx_iface_phy_rst(dev); @@ -693,7 +693,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; - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; /* Chip IRQ line */ ctx->irq_gpio = device_get_binding(conf->irq.devname); @@ -752,7 +752,7 @@ static inline int configure_gpios(struct device *dev) static inline int configure_spi(struct device *dev) { - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; const struct rf2xx_config *conf = dev->config; /* Get SPI Driver Instance*/ @@ -795,7 +795,7 @@ static inline int configure_spi(struct device *dev) static int rf2xx_init(struct device *dev) { - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; const struct rf2xx_config *conf = dev->config; char thread_name[20]; @@ -838,7 +838,7 @@ static int rf2xx_init(struct device *dev) static void rf2xx_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct rf2xx_context *ctx = dev->driver_data; + struct rf2xx_context *ctx = dev->data; uint8_t *mac = get_mac(dev); net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); diff --git a/drivers/ieee802154/ieee802154_rf2xx_iface.c b/drivers/ieee802154/ieee802154_rf2xx_iface.c index 6ff2b2ce465..c9ff4e107e0 100644 --- a/drivers/ieee802154/ieee802154_rf2xx_iface.c +++ b/drivers/ieee802154/ieee802154_rf2xx_iface.c @@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); void rf2xx_iface_phy_rst(struct device *dev) { const struct rf2xx_config *conf = dev->config; - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; /* Ensure control lines have correct levels. */ gpio_pin_set(ctx->reset_gpio, conf->reset.pin, 0); @@ -42,7 +42,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; - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; /* Start TX transmission at rise edge */ gpio_pin_set(ctx->slptr_gpio, conf->slptr.pin, 1); @@ -55,7 +55,7 @@ void rf2xx_iface_phy_tx_start(struct device *dev) uint8_t rf2xx_iface_reg_read(struct device *dev, uint8_t addr) { - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; uint8_t status; uint8_t regval = 0; @@ -99,7 +99,7 @@ void rf2xx_iface_reg_write(struct device *dev, uint8_t addr, uint8_t data) { - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; uint8_t status; addr |= RF2XX_RF_CMD_REG_W; @@ -170,7 +170,7 @@ void rf2xx_iface_frame_read(struct device *dev, uint8_t *data, uint8_t length) { - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; uint8_t cmd = RF2XX_RF_CMD_FRAME_R; const struct spi_buf tx_buf = { @@ -202,7 +202,7 @@ void rf2xx_iface_frame_write(struct device *dev, uint8_t *data, uint8_t length) { - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; uint8_t cmd = RF2XX_RF_CMD_FRAME_W; uint8_t status; uint8_t phr; @@ -254,7 +254,7 @@ void rf2xx_iface_sram_read(struct device *dev, uint8_t *data, uint8_t length) { - const struct rf2xx_context *ctx = dev->driver_data; + const struct rf2xx_context *ctx = dev->data; uint8_t cmd = RF2XX_RF_CMD_SRAM_R; uint8_t status[2]; diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c index c2efa1f592e..07a1745bfa1 100644 --- a/drivers/ieee802154/ieee802154_uart_pipe.c +++ b/drivers/ieee802154/ieee802154_uart_pipe.c @@ -53,7 +53,7 @@ static struct device *upipe_dev; static bool received_dest_addr_matched(uint8_t *rx_buffer) { - struct upipe_context *upipe = upipe_dev->driver_data; + struct upipe_context *upipe = upipe_dev->data; /* Check destination PAN Id */ if (memcmp(&rx_buffer[PAN_ID_OFFSET], @@ -108,7 +108,7 @@ static uint8_t *upipe_rx(uint8_t *buf, size_t *off) goto done; } - upipe = upipe_dev->driver_data; + upipe = upipe_dev->data; if (!upipe->rx && *buf == UART_PIPE_RADIO_15_4_FRAME_TYPE) { upipe->rx = true; goto done; @@ -186,7 +186,7 @@ static enum ieee802154_hw_caps upipe_get_capabilities(struct device *dev) static int upipe_cca(struct device *dev) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; if (upipe->stopped) { return -EIO; @@ -271,7 +271,7 @@ static int upipe_tx(struct device *dev, struct net_pkt *pkt, struct net_buf *frag) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; uint8_t *pkt_buf = frag->data; uint8_t len = frag->len; uint8_t i, data; @@ -302,7 +302,7 @@ static int upipe_tx(struct device *dev, static int upipe_start(struct device *dev) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; if (!upipe->stopped) { return -EALREADY; @@ -315,7 +315,7 @@ static int upipe_start(struct device *dev) static int upipe_stop(struct device *dev) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; if (upipe->stopped) { return -EALREADY; @@ -328,7 +328,7 @@ static int upipe_stop(struct device *dev) static int upipe_init(struct device *dev) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; (void)memset(upipe, 0, sizeof(struct upipe_context)); @@ -341,7 +341,7 @@ static int upipe_init(struct device *dev) static inline uint8_t *get_mac(struct device *dev) { - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; upipe->mac_addr[0] = 0x00; upipe->mac_addr[1] = 0x10; @@ -364,7 +364,7 @@ static inline uint8_t *get_mac(struct device *dev) static void upipe_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct upipe_context *upipe = dev->driver_data; + struct upipe_context *upipe = dev->data; uint8_t *mac = get_mac(dev); net_if_set_link_addr(iface, mac, 8, NET_LINK_IEEE802154); diff --git a/drivers/interrupt_controller/intc_cavs.c b/drivers/interrupt_controller/intc_cavs.c index 0aae506e9f8..92f8829f017 100644 --- a/drivers/interrupt_controller/intc_cavs.c +++ b/drivers/interrupt_controller/intc_cavs.c @@ -51,7 +51,7 @@ static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(uint32_t intr_status, static void cavs_ictl_isr(void *arg) { struct device *port = (struct device *)arg; - struct cavs_ictl_runtime *context = port->driver_data; + struct cavs_ictl_runtime *context = port->data; const struct cavs_ictl_config *config = port->config; @@ -64,7 +64,7 @@ static void cavs_ictl_isr(void *arg) static inline void cavs_ictl_irq_enable(struct device *dev, unsigned int irq) { - struct cavs_ictl_runtime *context = dev->driver_data; + struct cavs_ictl_runtime *context = dev->data; volatile struct cavs_registers * const regs = (struct cavs_registers *)context->base_addr; @@ -74,7 +74,7 @@ static inline void cavs_ictl_irq_enable(struct device *dev, unsigned int irq) static inline void cavs_ictl_irq_disable(struct device *dev, unsigned int irq) { - struct cavs_ictl_runtime *context = dev->driver_data; + struct cavs_ictl_runtime *context = dev->data; volatile struct cavs_registers * const regs = (struct cavs_registers *)context->base_addr; @@ -84,7 +84,7 @@ static inline void cavs_ictl_irq_disable(struct device *dev, unsigned int irq) static inline unsigned int cavs_ictl_irq_get_state(struct device *dev) { - struct cavs_ictl_runtime *context = dev->driver_data; + struct cavs_ictl_runtime *context = dev->data; volatile struct cavs_registers * const regs = (struct cavs_registers *)context->base_addr; @@ -102,7 +102,7 @@ static inline unsigned int cavs_ictl_irq_get_state(struct device *dev) static int cavs_ictl_irq_get_line_state(struct device *dev, unsigned int irq) { - struct cavs_ictl_runtime *context = dev->driver_data; + struct cavs_ictl_runtime *context = dev->data; volatile struct cavs_registers * const regs = (struct cavs_registers *)context->base_addr; diff --git a/drivers/interrupt_controller/intc_exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c index a557767d325..12e74b8e9cc 100644 --- a/drivers/interrupt_controller/intc_exti_stm32.c +++ b/drivers/interrupt_controller/intc_exti_stm32.c @@ -225,7 +225,7 @@ void stm32_exti_trigger(int line, int trigger) static void __stm32_exti_isr(int min, int max, void *arg) { struct device *dev = arg; - struct stm32_exti_data *data = dev->driver_data; + struct stm32_exti_data *data = dev->data; int line; /* see which bits are set */ @@ -413,7 +413,7 @@ DEVICE_INIT(exti_stm32, STM32_EXTI_NAME, stm32_exti_init, int stm32_exti_set_callback(int line, stm32_exti_callback_t cb, void *arg) { struct device *dev = DEVICE_GET(exti_stm32); - struct stm32_exti_data *data = dev->driver_data; + struct stm32_exti_data *data = dev->data; if (data->cb[line].cb) { return -EBUSY; @@ -428,7 +428,7 @@ int stm32_exti_set_callback(int line, stm32_exti_callback_t cb, void *arg) void stm32_exti_unset_callback(int line) { struct device *dev = DEVICE_GET(exti_stm32); - struct stm32_exti_data *data = dev->driver_data; + struct stm32_exti_data *data = dev->data; data->cb[line].cb = NULL; data->cb[line].data = NULL; diff --git a/drivers/interrupt_controller/intc_sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c index 1ceb3f09fc8..ca365a59640 100644 --- a/drivers/interrupt_controller/intc_sam0_eic.c +++ b/drivers/interrupt_controller/intc_sam0_eic.c @@ -28,7 +28,7 @@ struct sam0_eic_data { }; #define DEV_DATA(dev) \ - ((struct sam0_eic_data *const)(dev)->driver_data) + ((struct sam0_eic_data *const)(dev)->data) DEVICE_DECLARE(sam0_eic); @@ -103,7 +103,7 @@ int sam0_eic_acquire(int port, int pin, enum sam0_eic_trigger trigger, bool filter, sam0_eic_callback_t cb, void *data) { struct device *dev = DEVICE_GET(sam0_eic); - struct sam0_eic_data *dev_data = dev->driver_data; + struct sam0_eic_data *dev_data = dev->data; struct sam0_eic_port_data *port_data; struct sam0_eic_line_assignment *line_assignment; uint32_t mask; @@ -193,7 +193,7 @@ err_in_use: static bool sam0_eic_check_ownership(int port, int pin, int line_index) { struct device *dev = DEVICE_GET(sam0_eic); - struct sam0_eic_data *dev_data = dev->driver_data; + struct sam0_eic_data *dev_data = dev->data; struct sam0_eic_line_assignment *line_assignment = &dev_data->lines[line_index]; @@ -212,7 +212,7 @@ static bool sam0_eic_check_ownership(int port, int pin, int line_index) int sam0_eic_release(int port, int pin) { struct device *dev = DEVICE_GET(sam0_eic); - struct sam0_eic_data *dev_data = dev->driver_data; + struct sam0_eic_data *dev_data = dev->data; uint32_t mask; int line_index; int config_index; @@ -303,7 +303,7 @@ int sam0_eic_disable_interrupt(int port, int pin) uint32_t sam0_eic_interrupt_pending(int port) { struct device *dev = DEVICE_GET(sam0_eic); - struct sam0_eic_data *dev_data = dev->driver_data; + struct sam0_eic_data *dev_data = dev->data; struct sam0_eic_line_assignment *line_assignment; uint32_t set = EIC->INTFLAG.reg; uint32_t mask = 0; diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c index 012a193b191..addd2eccecb 100644 --- a/drivers/interrupt_controller/intc_shared_irq.c +++ b/drivers/interrupt_controller/intc_shared_irq.c @@ -27,7 +27,7 @@ static int isr_register(struct device *dev, isr_t isr_func, struct device *isr_dev) { - struct shared_irq_runtime *clients = dev->driver_data; + struct shared_irq_runtime *clients = dev->data; const struct shared_irq_config *config = dev->config; uint32_t i; @@ -48,7 +48,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; + struct shared_irq_runtime *clients = dev->data; const struct shared_irq_config *config = dev->config; uint32_t i; @@ -80,7 +80,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; + struct shared_irq_runtime *clients = dev->data; const struct shared_irq_config *config = dev->config; uint32_t i; @@ -98,7 +98,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; + struct shared_irq_runtime *clients = dev->data; const struct shared_irq_config *config = dev->config; uint32_t i; diff --git a/drivers/ipm/ipm_cavs_idc.c b/drivers/ipm/ipm_cavs_idc.c index 99ef9492430..974c77df77f 100644 --- a/drivers/ipm/ipm_cavs_idc.c +++ b/drivers/ipm/ipm_cavs_idc.c @@ -31,7 +31,7 @@ static struct cavs_idc_data cavs_idc_device_data; static void cavs_idc_isr(struct device *dev) { - struct cavs_idc_data *drv_data = dev->driver_data; + struct cavs_idc_data *drv_data = dev->data; uint32_t i, id; void *ext; @@ -159,7 +159,7 @@ static uint32_t cavs_idc_max_id_val_get(struct device *dev) static void cavs_idc_register_callback(struct device *dev, ipm_callback_t cb, void *user_data) { - struct cavs_idc_data *drv_data = dev->driver_data; + struct cavs_idc_data *drv_data = dev->data; drv_data->cb = cb; drv_data->user_data = user_data; diff --git a/drivers/ipm/ipm_imx.c b/drivers/ipm/ipm_imx.c index 570e5f9dd12..c4105e6254c 100644 --- a/drivers/ipm/ipm_imx.c +++ b/drivers/ipm/ipm_imx.c @@ -36,7 +36,7 @@ static void imx_mu_isr(void *arg) struct device *dev = (struct device *)arg; const struct imx_mu_config *config = dev->config; MU_Type *base = MU(config); - struct imx_mu_data *data = dev->driver_data; + struct imx_mu_data *data = dev->data; uint32_t data32[IMX_IPM_DATA_REGS]; uint32_t status_reg; int32_t id; @@ -142,7 +142,7 @@ static void imx_mu_ipm_register_callback(struct device *dev, ipm_callback_t cb, void *user_data) { - struct imx_mu_data *driver_data = dev->driver_data; + struct imx_mu_data *driver_data = dev->data; driver_data->callback = cb; driver_data->user_data = user_data; diff --git a/drivers/ipm/ipm_mcux.c b/drivers/ipm/ipm_mcux.c index 076e7f6de69..3140e25eb9a 100644 --- a/drivers/ipm/ipm_mcux.c +++ b/drivers/ipm/ipm_mcux.c @@ -37,7 +37,7 @@ struct mcux_mailbox_data { static void mcux_mailbox_isr(void *arg) { struct device *dev = arg; - struct mcux_mailbox_data *data = dev->driver_data; + struct mcux_mailbox_data *data = dev->data; const struct mcux_mailbox_config *config = dev->config; mailbox_cpu_id_t cpu_id; @@ -119,7 +119,7 @@ static void mcux_mailbox_ipm_register_callback(struct device *d, ipm_callback_t cb, void *context) { - struct mcux_mailbox_data *driver_data = d->driver_data; + struct mcux_mailbox_data *driver_data = d->data; driver_data->callback = cb; driver_data->callback_ctx = context; diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c index 7d160a49969..4ece426b26e 100644 --- a/drivers/ipm/ipm_mhu.c +++ b/drivers/ipm/ipm_mhu.c @@ -14,7 +14,7 @@ #define DEV_CFG(dev) \ ((const struct ipm_mhu_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct ipm_mhu_data *)(dev)->driver_data) + ((struct ipm_mhu_data *)(dev)->data) #define IPM_MHU_REGS(dev) \ ((volatile struct ipm_mhu_reg_map_t *)(DEV_CFG(dev))->base) diff --git a/drivers/ipm/ipm_stm32_ipcc.c b/drivers/ipm/ipm_stm32_ipcc.c index 86885d5bf86..7d0d5c7f77a 100644 --- a/drivers/ipm/ipm_stm32_ipcc.c +++ b/drivers/ipm/ipm_stm32_ipcc.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(ipm_stm32_ipcc, CONFIG_IPM_LOG_LEVEL); #define DEV_CFG(dev) \ ((const struct stm32_ipcc_mailbox_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct stm32_ipcc_mbx_data * const)(dev)->driver_data) + ((struct stm32_ipcc_mbx_data * const)(dev)->data) #define MBX_STRUCT(dev) \ ((IPCC_TypeDef *)(DEV_CFG(dev))->uconf.base) @@ -155,7 +155,7 @@ static void stm32_ipcc_mailbox_tx_isr(void *arg) static int stm32_ipcc_mailbox_ipm_send(struct device *dev, int wait, uint32_t id, const void *buff, int size) { - struct stm32_ipcc_mbx_data *data = dev->driver_data; + struct stm32_ipcc_mbx_data *data = dev->data; const struct stm32_ipcc_mailbox_config *cfg = DEV_CFG(dev); ARG_UNUSED(wait); diff --git a/drivers/kscan/kscan_ft5336.c b/drivers/kscan/kscan_ft5336.c index 9a3262e9e05..362708eeb56 100644 --- a/drivers/kscan/kscan_ft5336.c +++ b/drivers/kscan/kscan_ft5336.c @@ -50,7 +50,7 @@ struct ft5336_data { static int ft5336_read(struct device *dev) { const struct ft5336_config *config = dev->config; - struct ft5336_data *data = dev->driver_data; + struct ft5336_data *data = dev->data; uint8_t buffer[FT5406_DATA_SIZE]; uint8_t event; uint16_t row, column; @@ -115,7 +115,7 @@ static void ft5336_isr_handler(struct device *dev, struct gpio_callback *cb, static int ft5336_configure(struct device *dev, kscan_callback_t callback) { - struct ft5336_data *data = dev->driver_data; + struct ft5336_data *data = dev->data; if (!callback) { return -EINVAL; @@ -128,7 +128,7 @@ static int ft5336_configure(struct device *dev, kscan_callback_t callback) static int ft5336_enable_callback(struct device *dev) { - struct ft5336_data *data = dev->driver_data; + struct ft5336_data *data = dev->data; #ifdef CONFIG_KSCAN_FT5336_INTERRUPT gpio_add_callback(data->int_gpio_dev, &data->int_gpio_cb); @@ -142,7 +142,7 @@ static int ft5336_enable_callback(struct device *dev) static int ft5336_disable_callback(struct device *dev) { - struct ft5336_data *data = dev->driver_data; + struct ft5336_data *data = dev->data; #ifdef CONFIG_KSCAN_FT5336_INTERRUPT gpio_remove_callback(data->int_gpio_dev, &data->int_gpio_cb); @@ -156,7 +156,7 @@ static int ft5336_disable_callback(struct device *dev) static int ft5336_init(struct device *dev) { const struct ft5336_config *config = dev->config; - struct ft5336_data *data = dev->driver_data; + struct ft5336_data *data = dev->data; data->i2c = device_get_binding(config->i2c_name); if (data->i2c == NULL) { diff --git a/drivers/kscan/kscan_sdl.c b/drivers/kscan/kscan_sdl.c index 3a639840e4c..8d747c13a68 100644 --- a/drivers/kscan/kscan_sdl.c +++ b/drivers/kscan/kscan_sdl.c @@ -19,7 +19,7 @@ struct sdl_data { static int sdl_filter(void *arg, SDL_Event *event) { struct device *dev = arg; - struct sdl_data *data = dev->driver_data; + struct sdl_data *data = dev->data; uint32_t row = 0; uint32_t column = 0; bool pressed = 0; @@ -54,7 +54,7 @@ static int sdl_filter(void *arg, SDL_Event *event) static int sdl_configure(struct device *dev, kscan_callback_t callback) { - struct sdl_data *data = dev->driver_data; + struct sdl_data *data = dev->data; if (!callback) { LOG_ERR("Callback is null"); @@ -69,7 +69,7 @@ static int sdl_configure(struct device *dev, kscan_callback_t callback) static int sdl_enable_callback(struct device *dev) { - struct sdl_data *data = dev->driver_data; + struct sdl_data *data = dev->data; LOG_DBG("%s: enable cb", dev->name); data->enabled = true; @@ -78,7 +78,7 @@ static int sdl_enable_callback(struct device *dev) static int sdl_disable_callback(struct device *dev) { - struct sdl_data *data = dev->driver_data; + struct sdl_data *data = dev->data; LOG_DBG("%s: disable cb", dev->name); data->enabled = false; diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c index ecaafbc04d6..3971fb93ab7 100644 --- a/drivers/led/ht16k33.c +++ b/drivers/led/ht16k33.c @@ -101,7 +101,7 @@ static int ht16k33_led_blink(struct device *dev, uint32_t led, ARG_UNUSED(led); const struct ht16k33_cfg *config = dev->config; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint32_t period; uint8_t cmd; @@ -136,7 +136,7 @@ static int ht16k33_led_set_brightness(struct device *dev, uint32_t led, ARG_UNUSED(led); const struct ht16k33_cfg *config = dev->config; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t dim; uint8_t cmd; @@ -160,7 +160,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; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; uint8_t cmd[2]; uint8_t addr; uint8_t bit; @@ -207,7 +207,7 @@ static int ht16k33_led_off(struct device *dev, uint32_t led) uint32_t ht16k33_get_pending_int(struct device *dev) { const struct ht16k33_cfg *config = dev->config; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; uint8_t cmd; uint8_t flag; int err; @@ -226,7 +226,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; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; uint8_t keys[HT16K33_KEYSCAN_DATA_SIZE]; bool pressed = false; uint16_t row; @@ -263,7 +263,7 @@ static bool ht16k33_process_keyscan_data(struct device *dev) static void ht16k33_irq_thread(struct device *dev) { - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; bool pressed; while (true) { @@ -301,7 +301,7 @@ int ht16k33_register_keyscan_device(struct device *parent, struct device *child, uint8_t keyscan_idx) { - struct ht16k33_data *data = parent->driver_data; + struct ht16k33_data *data = parent->data; k_mutex_lock(&data->lock, K_FOREVER); @@ -322,7 +322,7 @@ int ht16k33_register_keyscan_device(struct device *parent, static int ht16k33_init(struct device *dev) { const struct ht16k33_cfg *config = dev->config; - struct ht16k33_data *data = dev->driver_data; + struct ht16k33_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t cmd[1 + HT16K33_DISP_DATA_SIZE]; /* 1 byte command + data */ int err; diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c index 05a05b51d21..300dc01f190 100644 --- a/drivers/led/lp3943.c +++ b/drivers/led/lp3943.c @@ -123,7 +123,7 @@ static int lp3943_set_dim_states(struct lp3943_data *data, uint32_t led, uint8_t static int lp3943_led_blink(struct device *dev, uint32_t led, uint32_t delay_on, uint32_t delay_off) { - struct lp3943_data *data = dev->driver_data; + struct lp3943_data *data = dev->data; struct led_data *dev_data = &data->dev_data; int ret; uint16_t period; @@ -166,7 +166,7 @@ static int lp3943_led_blink(struct device *dev, uint32_t led, static int lp3943_led_set_brightness(struct device *dev, uint32_t led, uint8_t value) { - struct lp3943_data *data = dev->driver_data; + struct lp3943_data *data = dev->data; struct led_data *dev_data = &data->dev_data; int ret; uint8_t reg, val, mode; @@ -206,7 +206,7 @@ static int lp3943_led_set_brightness(struct device *dev, uint32_t led, static inline int lp3943_led_on(struct device *dev, uint32_t led) { - struct lp3943_data *data = dev->driver_data; + struct lp3943_data *data = dev->data; int ret; uint8_t reg, mode; @@ -230,7 +230,7 @@ static inline int lp3943_led_on(struct device *dev, uint32_t led) static inline int lp3943_led_off(struct device *dev, uint32_t led) { - struct lp3943_data *data = dev->driver_data; + struct lp3943_data *data = dev->data; int ret; uint8_t reg; @@ -252,7 +252,7 @@ static inline int lp3943_led_off(struct device *dev, uint32_t led) static int lp3943_led_init(struct device *dev) { - struct lp3943_data *data = dev->driver_data; + struct lp3943_data *data = dev->data; struct led_data *dev_data = &data->dev_data; data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c index 83b4336309e..0bd50da553a 100644 --- a/drivers/led/lp5562.c +++ b/drivers/led/lp5562.c @@ -307,7 +307,7 @@ static int lp5562_set_led_source(struct device *dev, enum lp5562_led_channels channel, enum lp5562_led_sources source) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0), LP5562_LED_MAP, @@ -334,7 +334,7 @@ static int lp5562_get_led_source(struct device *dev, enum lp5562_led_channels channel, enum lp5562_led_sources *source) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; uint8_t led_map; if (i2c_reg_read_byte(data->i2c, DT_INST_REG_ADDR(0), @@ -361,7 +361,7 @@ static int lp5562_get_led_source(struct device *dev, static bool lp5562_is_engine_executing(struct device *dev, enum lp5562_led_sources engine) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; uint8_t enabled, shift; int ret; @@ -427,7 +427,7 @@ static int lp5562_set_engine_reg(struct device *dev, enum lp5562_led_sources engine, uint8_t reg, uint8_t val) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; uint8_t shift; int ret; @@ -550,7 +550,7 @@ static int lp5562_program_command(struct device *dev, uint8_t command_msb, uint8_t command_lsb) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; uint8_t prog_base_addr; int ret; @@ -598,7 +598,7 @@ static int lp5562_program_set_brightness(struct device *dev, uint8_t command_index, uint8_t brightness) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t val; @@ -637,7 +637,7 @@ static int lp5562_program_ramp(struct device *dev, uint8_t step_count, enum lp5562_engine_fade_dirs fade_dir) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t prescale, step_time; @@ -757,7 +757,7 @@ static int lp5562_update_blinking_brightness(struct device *dev, static int lp5562_led_blink(struct device *dev, uint32_t led, uint32_t delay_on, uint32_t delay_off) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; int ret; enum lp5562_led_sources engine; @@ -817,7 +817,7 @@ static int lp5562_led_blink(struct device *dev, uint32_t led, static int lp5562_led_set_brightness(struct device *dev, uint32_t led, uint8_t value) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; int ret; uint8_t val, reg; @@ -867,7 +867,7 @@ static int lp5562_led_set_brightness(struct device *dev, uint32_t led, uint8_t v static inline int lp5562_led_on(struct device *dev, uint32_t led) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; return lp5562_led_set_brightness(dev, led, dev_data->max_brightness); @@ -875,7 +875,7 @@ static inline int lp5562_led_on(struct device *dev, uint32_t led) static inline int lp5562_led_off(struct device *dev, uint32_t led) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; int ret; @@ -898,7 +898,7 @@ static inline int lp5562_led_off(struct device *dev, uint32_t led) static int lp5562_led_init(struct device *dev) { - struct lp5562_data *data = dev->driver_data; + struct lp5562_data *data = dev->data; struct led_data *dev_data = &data->dev_data; data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c index 201aa5c7174..0c21d7abe7e 100644 --- a/drivers/led/pca9633.c +++ b/drivers/led/pca9633.c @@ -49,7 +49,7 @@ struct pca9633_data { static int pca9633_led_blink(struct device *dev, uint32_t led, uint32_t delay_on, uint32_t delay_off) { - struct pca9633_data *data = dev->driver_data; + struct pca9633_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t gdc, gfrq; uint32_t period; @@ -112,7 +112,7 @@ static int pca9633_led_blink(struct device *dev, uint32_t led, static int pca9633_led_set_brightness(struct device *dev, uint32_t led, uint8_t value) { - struct pca9633_data *data = dev->driver_data; + struct pca9633_data *data = dev->data; struct led_data *dev_data = &data->dev_data; uint8_t val; @@ -144,7 +144,7 @@ static int pca9633_led_set_brightness(struct device *dev, uint32_t led, static inline int pca9633_led_on(struct device *dev, uint32_t led) { - struct pca9633_data *data = dev->driver_data; + struct pca9633_data *data = dev->data; /* Set LED state to ON */ if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0), @@ -160,7 +160,7 @@ static inline int pca9633_led_on(struct device *dev, uint32_t led) static inline int pca9633_led_off(struct device *dev, uint32_t led) { - struct pca9633_data *data = dev->driver_data; + struct pca9633_data *data = dev->data; /* Set LED state to OFF */ if (i2c_reg_update_byte(data->i2c, DT_INST_REG_ADDR(0), @@ -176,7 +176,7 @@ static inline int pca9633_led_off(struct device *dev, uint32_t led) static int pca9633_led_init(struct device *dev) { - struct pca9633_data *data = dev->driver_data; + struct pca9633_data *data = dev->data; struct led_data *dev_data = &data->dev_data; data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/led_strip/apa102.c b/drivers/led_strip/apa102.c index 7b11ddeaf7c..7c6e94904db 100644 --- a/drivers/led_strip/apa102.c +++ b/drivers/led_strip/apa102.c @@ -22,7 +22,7 @@ struct apa102_data { static int apa102_update(struct device *dev, void *buf, size_t size) { - struct apa102_data *data = dev->driver_data; + struct apa102_data *data = dev->data; static const uint8_t zeros[] = {0, 0, 0, 0}; static const uint8_t ones[] = {0xFF, 0xFF, 0xFF, 0xFF}; const struct spi_buf tx_bufs[] = { @@ -86,7 +86,7 @@ static int apa102_update_channels(struct device *dev, uint8_t *channels, static int apa102_init(struct device *dev) { - struct apa102_data *data = dev->driver_data; + struct apa102_data *data = dev->data; data->spi = device_get_binding(DT_INST_BUS_LABEL(0)); if (!data->spi) { diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c index 74e97f9afc2..85f474a65f4 100644 --- a/drivers/led_strip/lpd880x.c +++ b/drivers/led_strip/lpd880x.c @@ -42,7 +42,7 @@ struct lpd880x_data { static int lpd880x_update(struct device *dev, void *data, size_t size) { - struct lpd880x_data *drv_data = dev->driver_data; + struct lpd880x_data *drv_data = dev->data; /* * Per the AdaFruit reverse engineering notes on the protocol, * a zero byte propagates through at most 32 LED driver ICs. @@ -128,7 +128,7 @@ static int lpd880x_strip_update_channels(struct device *dev, uint8_t *channels, static int lpd880x_strip_init(struct device *dev) { - struct lpd880x_data *data = dev->driver_data; + struct lpd880x_data *data = dev->data; struct spi_config *config = &data->config; data->spi = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/led_strip/ws2812_gpio.c b/drivers/led_strip/ws2812_gpio.c index 85f05b88436..2fc85fbc509 100644 --- a/drivers/led_strip/ws2812_gpio.c +++ b/drivers/led_strip/ws2812_gpio.c @@ -33,7 +33,7 @@ struct ws2812_gpio_cfg { static struct ws2812_gpio_data *dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static const struct ws2812_gpio_cfg *dev_cfg(struct device *dev) diff --git a/drivers/led_strip/ws2812_spi.c b/drivers/led_strip/ws2812_spi.c index 3279ba64fa8..ddd48cf25aa 100644 --- a/drivers/led_strip/ws2812_spi.c +++ b/drivers/led_strip/ws2812_spi.c @@ -59,7 +59,7 @@ struct ws2812_spi_cfg { static struct ws2812_spi_data *dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static const struct ws2812_spi_cfg *dev_cfg(struct device *dev) diff --git a/drivers/modem/gsm_ppp.c b/drivers/modem/gsm_ppp.c index 4a145aba7e4..9848852cbfd 100644 --- a/drivers/modem/gsm_ppp.c +++ b/drivers/modem/gsm_ppp.c @@ -251,7 +251,7 @@ static void set_ppp_carrier_on(struct gsm_modem *gsm) return; } - api = (const struct ppp_api *)ppp_dev->driver_api; + api = (const struct ppp_api *)ppp_dev->api; api->start(ppp_dev); } @@ -561,7 +561,7 @@ static void gsm_configure(struct k_work *work) static int gsm_init(struct device *device) { - struct gsm_modem *gsm = device->driver_data; + struct gsm_modem *gsm = device->data; int r; LOG_DBG("Generic GSM modem (%p)", gsm); diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c index 002bb028b73..a747b5d6279 100644 --- a/drivers/modem/ublox-sara-r4.c +++ b/drivers/modem/ublox-sara-r4.c @@ -1667,7 +1667,7 @@ static uint32_t hash32(char *str, int len) static inline uint8_t *modem_get_mac(struct device *dev) { - struct modem_data *data = dev->driver_data; + struct modem_data *data = dev->data; uint32_t hash_value; data->mac_addr[0] = 0x00; @@ -1684,7 +1684,7 @@ static inline uint8_t *modem_get_mac(struct device *dev) static void modem_net_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct modem_data *data = dev->driver_data; + struct modem_data *data = dev->data; /* Direct socket offload used instead of net offload: */ iface->if_dev->offload = &modem_net_offload; diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c index aa1a043a592..9a1a7ed75c5 100644 --- a/drivers/modem/wncm14a2a.c +++ b/drivers/modem/wncm14a2a.c @@ -1820,7 +1820,7 @@ static struct net_offload offload_funcs = { static inline uint8_t *wncm14a2a_get_mac(struct device *dev) { - struct wncm14a2a_iface_ctx *ctx = dev->driver_data; + struct wncm14a2a_iface_ctx *ctx = dev->data; ctx->mac_addr[0] = 0x00; ctx->mac_addr[1] = 0x10; @@ -1834,7 +1834,7 @@ static inline uint8_t *wncm14a2a_get_mac(struct device *dev) static void offload_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct wncm14a2a_iface_ctx *ctx = dev->driver_data; + struct wncm14a2a_iface_ctx *ctx = dev->data; iface->if_dev->offload = &offload_funcs; net_if_set_link_addr(iface, wncm14a2a_get_mac(dev), diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c index b690c9366f7..626545518df 100644 --- a/drivers/net/ppp.c +++ b/drivers/net/ppp.c @@ -538,7 +538,7 @@ static uint16_t ppp_escape_byte(uint8_t byte, int *offset) static int ppp_send(struct device *dev, struct net_pkt *pkt) { - struct ppp_driver_context *ppp = dev->driver_data; + struct ppp_driver_context *ppp = dev->data; struct net_buf *buf = pkt->buffer; uint16_t protocol = 0; int send_off = 0; @@ -684,7 +684,7 @@ static void ppp_isr_cb_work(struct k_work *work) static int ppp_driver_init(struct device *dev) { - struct ppp_driver_context *ppp = dev->driver_data; + struct ppp_driver_context *ppp = dev->data; LOG_DBG("[%p] dev %p", ppp, dev); @@ -717,7 +717,7 @@ static inline struct net_linkaddr *ppp_get_mac(struct ppp_driver_context *ppp) static void ppp_iface_init(struct net_if *iface) { - struct ppp_driver_context *ppp = net_if_get_device(iface)->driver_data; + struct ppp_driver_context *ppp = net_if_get_device(iface)->data; struct net_linkaddr *ll_addr; LOG_DBG("[%p] iface %p", ppp, iface); @@ -768,7 +768,7 @@ use_random_mac: #if defined(CONFIG_NET_STATISTICS_PPP) static struct net_stats_ppp *ppp_get_stats(struct device *dev) { - struct ppp_driver_context *context = dev->driver_data; + struct ppp_driver_context *context = dev->data; return &context->stats; } @@ -811,7 +811,7 @@ static void ppp_uart_isr(struct device *uart, void *user_data) static int ppp_start(struct device *dev) { - struct ppp_driver_context *context = dev->driver_data; + struct ppp_driver_context *context = dev->data; /* Init the PPP UART only once. This should only be done after * the GSM muxing is setup and enabled. GSM modem will call this @@ -871,7 +871,7 @@ static int ppp_start(struct device *dev) static int ppp_stop(struct device *dev) { - struct ppp_driver_context *context = dev->driver_data; + struct ppp_driver_context *context = dev->data; net_ppp_carrier_off(context->iface); diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 31639e9b126..61f24822a67 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -365,7 +365,7 @@ static uint8_t *recv_cb(uint8_t *buf, size_t *off) static int slip_init(struct device *dev) { - struct slip_context *slip = dev->driver_data; + struct slip_context *slip = dev->data; LOG_DBG("[%p] dev %p", slip, dev); @@ -392,7 +392,7 @@ static inline struct net_linkaddr *slip_get_mac(struct slip_context *slip) static void slip_iface_init(struct net_if *iface) { - struct slip_context *slip = net_if_get_device(iface)->driver_data; + struct slip_context *slip = net_if_get_device(iface)->data; struct net_linkaddr *ll_addr; #if defined(CONFIG_NET_L2_ETHERNET) diff --git a/drivers/neural_net/intel_gna.c b/drivers/neural_net/intel_gna.c index 3e7c96ba53e..275161a7cfb 100644 --- a/drivers/neural_net/intel_gna.c +++ b/drivers/neural_net/intel_gna.c @@ -28,7 +28,7 @@ LOG_MODULE_REGISTER(neural_net); #define DEV_CFG(dev) \ ((const struct intel_gna_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct intel_gna_data *const)(dev)->driver_data) + ((struct intel_gna_data *const)(dev)->data) #if LOG_LEVEL >= LOG_LEVEL_DBG static void intel_gna_regs_dump(struct device *dev); diff --git a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c index cf6814d0461..ec25feb82c6 100644 --- a/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c +++ b/drivers/pcie/endpoint/pcie_ep_bcm_iproc.c @@ -52,7 +52,7 @@ static int iproc_pcie_map_addr(struct device *dev, uint64_t pcie_addr, enum pcie_ob_mem_type ob_mem_type) { const struct iproc_pcie_ep_config *cfg = dev->config; - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; uint64_t pcie_ob_base, pcie_ob_size, pcie_addr_start, offset; uint32_t mapped_size; enum pcie_outbound_map idx; @@ -119,7 +119,7 @@ out: static void iproc_pcie_unmap_addr(struct device *dev, uint64_t mapped_addr) { - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; k_spinlock_key_t key; key = k_spin_lock(&ctx->ob_map_lock); @@ -215,7 +215,7 @@ static int iproc_pcie_raise_irq(struct device *dev, enum pci_ep_irq_type irq_type, uint32_t irq_num) { - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; k_spinlock_key_t key; int ret; @@ -244,7 +244,7 @@ static int iproc_pcie_register_reset_cb(struct device *dev, enum pcie_reset reset, pcie_ep_reset_callback_t cb, void *arg) { - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; if (reset < PCIE_PERST || reset >= PCIE_RESET_MAX) return -EINVAL; @@ -260,7 +260,7 @@ static int iproc_pcie_register_reset_cb(struct device *dev, static void iproc_pcie_perst(void *arg) { struct device *dev = arg; - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; void *reset_data; uint32_t data; @@ -282,7 +282,7 @@ static void iproc_pcie_perst(void *arg) static void iproc_pcie_hot_reset(void *arg) { struct device *dev = arg; - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; void *reset_data; uint32_t data; @@ -305,7 +305,7 @@ static void iproc_pcie_flr(void *arg) { struct device *dev = arg; const struct iproc_pcie_ep_config *cfg = dev->config; - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; void *reset_data; uint32_t data; @@ -430,7 +430,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; - struct iproc_pcie_ep_ctx *ctx = dev->driver_data; + struct iproc_pcie_ep_ctx *ctx = dev->data; int ret; uint32_t data; diff --git a/drivers/ps2/ps2_mchp_xec.c b/drivers/ps2/ps2_mchp_xec.c index e5fcc4b9b27..c6f5ec0b21f 100644 --- a/drivers/ps2/ps2_mchp_xec.c +++ b/drivers/ps2/ps2_mchp_xec.c @@ -33,7 +33,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; - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; PS2_Type *base = config->base; uint8_t __attribute__((unused)) dummy; @@ -70,7 +70,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; - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; PS2_Type *base = config->base; int i = 0; @@ -119,7 +119,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; - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; PS2_Type *base = config->base; if (k_sem_take(&data->tx_lock, K_MSEC(10)) != 0) { @@ -138,7 +138,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; - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; PS2_Type *base = config->base; MCHP_GIRQ_SRC(config->girq_id) = BIT(config->girq_bit); @@ -152,7 +152,7 @@ static void ps2_xec_isr(void *arg) { struct device *dev = (struct device *)arg; const struct ps2_xec_config *config = dev->config; - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; PS2_Type *base = config->base; uint32_t status; @@ -210,7 +210,7 @@ static int ps2_xec_init_0(struct device *dev) { ARG_UNUSED(dev); - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; k_sem_init(&data->tx_lock, 0, 1); @@ -247,7 +247,7 @@ static int ps2_xec_init_1(struct device *dev) { ARG_UNUSED(dev); - struct ps2_xec_data *data = dev->driver_data; + struct ps2_xec_data *data = dev->data; k_sem_init(&data->tx_lock, 0, 1); diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c index c7661313a3e..4917a37d2df 100644 --- a/drivers/pwm/pwm_imx.c +++ b/drivers/pwm/pwm_imx.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(pwm_imx); #define DEV_CFG(dev) \ ((const struct imx_pwm_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct imx_pwm_data * const)(dev)->driver_data) + ((struct imx_pwm_data * const)(dev)->data) #define DEV_BASE(dev) \ ((PWM_Type *)(DEV_CFG(dev))->base) diff --git a/drivers/pwm/pwm_mcux.c b/drivers/pwm/pwm_mcux.c index cd800f4fa80..ad84d0bd508 100644 --- a/drivers/pwm/pwm_mcux.c +++ b/drivers/pwm/pwm_mcux.c @@ -36,7 +36,7 @@ static int mcux_pwm_pin_set(struct device *dev, uint32_t pwm, pwm_flags_t flags) { const struct pwm_mcux_config *config = dev->config; - struct pwm_mcux_data *data = dev->driver_data; + struct pwm_mcux_data *data = dev->data; uint8_t duty_cycle; if (pwm >= CHANNEL_COUNT) { @@ -121,7 +121,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; - struct pwm_mcux_data *data = dev->driver_data; + struct pwm_mcux_data *data = dev->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 56ea01c5958..b8703df204d 100644 --- a/drivers/pwm/pwm_mcux_ftm.c +++ b/drivers/pwm/pwm_mcux_ftm.c @@ -40,7 +40,7 @@ static int mcux_ftm_pin_set(struct device *dev, uint32_t pwm, pwm_flags_t flags) { const struct mcux_ftm_config *config = dev->config; - struct mcux_ftm_data *data = dev->driver_data; + struct mcux_ftm_data *data = dev->data; status_t status; if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) { @@ -99,7 +99,7 @@ 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; - struct mcux_ftm_data *data = dev->driver_data; + struct mcux_ftm_data *data = dev->data; *cycles = data->clock_freq >> config->prescale; @@ -109,7 +109,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; - struct mcux_ftm_data *data = dev->driver_data; + struct mcux_ftm_data *data = dev->data; ftm_chnl_pwm_config_param_t *channel = data->channel; struct device *clock_dev; ftm_config_t ftm_config; diff --git a/drivers/pwm/pwm_mcux_tpm.c b/drivers/pwm/pwm_mcux_tpm.c index cce247622eb..3b4728d4040 100644 --- a/drivers/pwm/pwm_mcux_tpm.c +++ b/drivers/pwm/pwm_mcux_tpm.c @@ -44,7 +44,7 @@ static int mcux_tpm_pin_set(struct device *dev, uint32_t pwm, pwm_flags_t flags) { const struct mcux_tpm_config *config = dev->config; - struct mcux_tpm_data *data = dev->driver_data; + struct mcux_tpm_data *data = dev->data; uint8_t duty_cycle; if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) { @@ -120,7 +120,7 @@ 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; - struct mcux_tpm_data *data = dev->driver_data; + struct mcux_tpm_data *data = dev->data; *cycles = data->clock_freq >> config->prescale; @@ -130,7 +130,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; - struct mcux_tpm_data *data = dev->driver_data; + struct mcux_tpm_data *data = dev->data; tpm_chnl_pwm_signal_param_t *channel = data->channel; struct device *clock_dev; tpm_config_t tpm_config; diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c index 0feb5f686af..cc95e361139 100644 --- a/drivers/pwm/pwm_nrf5_sw.c +++ b/drivers/pwm/pwm_nrf5_sw.c @@ -102,7 +102,7 @@ static int pwm_nrf5_sw_pin_set(struct device *dev, uint32_t pwm, config = (const struct pwm_config *)dev->config; timer = config->timer; - data = dev->driver_data; + data = dev->data; if (flags) { /* PWM polarity not supported (yet?) */ diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index c587fd9b8ca..1ad437cc6f7 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -132,7 +132,7 @@ static int pwm_nrfx_pin_set(struct device *dev, uint32_t pwm, * TODO: Remove this comment when issue has been resolved. */ const struct pwm_nrfx_config *config = dev->config; - struct pwm_nrfx_data *data = dev->driver_data; + struct pwm_nrfx_data *data = dev->data; uint8_t channel; bool was_stopped; diff --git a/drivers/pwm/pwm_pca9685.c b/drivers/pwm/pwm_pca9685.c index b730af11e2a..47ebc7a74ad 100644 --- a/drivers/pwm/pwm_pca9685.c +++ b/drivers/pwm/pwm_pca9685.c @@ -46,7 +46,7 @@ static inline int has_i2c_master(struct device *dev) { struct pwm_pca9685_drv_data * const drv_data = - (struct pwm_pca9685_drv_data * const)dev->driver_data; + (struct pwm_pca9685_drv_data * const)dev->data; struct device * const i2c_master = drv_data->i2c_master; if (i2c_master) { @@ -67,7 +67,7 @@ static int pwm_pca9685_pin_set_cycles(struct device *dev, uint32_t pwm, const struct pwm_pca9685_config * const config = dev->config; struct pwm_pca9685_drv_data * const drv_data = - (struct pwm_pca9685_drv_data * const)dev->driver_data; + (struct pwm_pca9685_drv_data * const)dev->data; struct device * const i2c_master = drv_data->i2c_master; uint16_t i2c_addr = config->i2c_slave_addr; uint8_t buf[] = { 0, 0, 0, 0, 0}; @@ -130,7 +130,7 @@ int pwm_pca9685_init(struct device *dev) const struct pwm_pca9685_config * const config = dev->config; struct pwm_pca9685_drv_data * const drv_data = - (struct pwm_pca9685_drv_data * const)dev->driver_data; + (struct pwm_pca9685_drv_data * const)dev->data; struct device *i2c_master; uint8_t buf[] = {0, 0}; int ret; diff --git a/drivers/pwm/pwm_rv32m1_tpm.c b/drivers/pwm/pwm_rv32m1_tpm.c index d3b6fa91166..ad757ea3c22 100644 --- a/drivers/pwm/pwm_rv32m1_tpm.c +++ b/drivers/pwm/pwm_rv32m1_tpm.c @@ -43,7 +43,7 @@ static int rv32m1_tpm_pin_set(struct device *dev, uint32_t pwm, pwm_flags_t flags) { const struct rv32m1_tpm_config *config = dev->config; - struct rv32m1_tpm_data *data = dev->driver_data; + struct rv32m1_tpm_data *data = dev->data; uint8_t duty_cycle; if ((period_cycles == 0U) || (pulse_cycles > period_cycles)) { @@ -119,7 +119,7 @@ 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; - struct rv32m1_tpm_data *data = dev->driver_data; + struct rv32m1_tpm_data *data = dev->data; *cycles = data->clock_freq >> config->prescale; @@ -129,7 +129,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; - struct rv32m1_tpm_data *data = dev->driver_data; + struct rv32m1_tpm_data *data = dev->data; tpm_chnl_pwm_signal_param_t *channel = data->channel; struct device *clock_dev; tpm_config_t tpm_config; diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c index 32032c3992e..4b62ba02b7e 100644 --- a/drivers/pwm/pwm_stm32.c +++ b/drivers/pwm/pwm_stm32.c @@ -77,7 +77,7 @@ static void (*const set_timer_compare[TIMER_MAX_CH])(TIM_TypeDef *, static inline struct pwm_stm32_data *to_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct pwm_stm32_config *to_config(struct device *dev) diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c index 6075d0eac53..b8cf3370229 100644 --- a/drivers/sensor/adt7420/adt7420.c +++ b/drivers/sensor/adt7420/adt7420.c @@ -21,7 +21,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; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, @@ -36,7 +36,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; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; uint8_t buf[3] = {reg, val >> 8, val & 0xFF}; @@ -48,7 +48,7 @@ static int adt7420_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; uint8_t val8, reg = 0U; uint16_t rate; @@ -112,7 +112,7 @@ static int adt7420_attr_set(struct device *dev, static int adt7420_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; int16_t value; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || @@ -131,7 +131,7 @@ static int adt7420_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; int32_t value; if (chan != SENSOR_CHAN_AMBIENT_TEMP) { @@ -156,7 +156,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; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; uint8_t value; int ret; @@ -202,7 +202,7 @@ static int adt7420_probe(struct device *dev) static int adt7420_init(struct device *dev) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; drv_data->i2c = device_get_binding(cfg->i2c_port); diff --git a/drivers/sensor/adt7420/adt7420_trigger.c b/drivers/sensor/adt7420/adt7420_trigger.c index e1b8495a8df..6897901521e 100644 --- a/drivers/sensor/adt7420/adt7420_trigger.c +++ b/drivers/sensor/adt7420/adt7420_trigger.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(ADT7420, CONFIG_SENSOR_LOG_LEVEL); static void setup_int(struct device *dev, bool enable) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; gpio_flags_t flags = enable ? GPIO_INT_EDGE_TO_ACTIVE @@ -30,7 +30,7 @@ static void setup_int(struct device *dev, static void handle_int(struct device *dev) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; setup_int(dev, false); @@ -43,7 +43,7 @@ static void handle_int(struct device *dev) static void process_int(struct device *dev) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; uint8_t status; @@ -80,7 +80,7 @@ static void adt7420_gpio_callback(struct device *dev, static void adt7420_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -104,7 +104,7 @@ int adt7420_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; setup_int(dev, false); @@ -133,7 +133,7 @@ int adt7420_trigger_set(struct device *dev, int adt7420_init_interrupt(struct device *dev) { - struct adt7420_data *drv_data = dev->driver_data; + struct adt7420_data *drv_data = dev->data; const struct adt7420_dev_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->int_name); diff --git a/drivers/sensor/adxl345/adxl345.c b/drivers/sensor/adxl345/adxl345.c index ec3ab78a5a4..a897cc0cf54 100644 --- a/drivers/sensor/adxl345/adxl345.c +++ b/drivers/sensor/adxl345/adxl345.c @@ -20,7 +20,7 @@ LOG_MODULE_REGISTER(ADXL345, CONFIG_SENSOR_LOG_LEVEL); static int adxl345_read_sample(struct device *dev, struct adxl345_sample *sample) { - struct adxl345_dev_data *data = dev->driver_data; + struct adxl345_dev_data *data = dev->data; int16_t raw_x, raw_y, raw_z; uint8_t axis_data[6]; @@ -58,7 +58,7 @@ static void adxl345_accel_convert(struct sensor_value *val, int16_t sample) static int adxl345_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct adxl345_dev_data *data = dev->driver_data; + struct adxl345_dev_data *data = dev->data; struct adxl345_sample sample; uint8_t samples_count; int rc; @@ -91,7 +91,7 @@ static int adxl345_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct adxl345_dev_data *data = dev->driver_data; + struct adxl345_dev_data *data = dev->data; if (data->sample_number >= ARRAY_SIZE(data->bufx)) { data->sample_number = 0; @@ -131,7 +131,7 @@ static const struct sensor_driver_api adxl345_api_funcs = { static int adxl345_init(struct device *dev) { int rc; - struct adxl345_dev_data *data = dev->driver_data; + struct adxl345_dev_data *data = dev->data; const struct adxl345_dev_config *cfg = dev->config; uint8_t dev_id; diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c index 7cec6cb316d..a67f13faf9a 100644 --- a/drivers/sensor/adxl362/adxl362.c +++ b/drivers/sensor/adxl362/adxl362.c @@ -61,7 +61,7 @@ static int adxl362_reg_access(struct adxl362_data *ctx, uint8_t cmd, static inline int adxl362_set_reg(struct device *dev, uint16_t register_value, uint8_t register_address, uint8_t count) { - struct adxl362_data *adxl362_data = dev->driver_data; + struct adxl362_data *adxl362_data = dev->data; return adxl362_reg_access(adxl362_data, ADXL362_WRITE_REG, @@ -75,7 +75,7 @@ int adxl362_reg_write_mask(struct device *dev, uint8_t register_address, { int ret; uint8_t tmp; - struct adxl362_data *adxl362_data = dev->driver_data; + struct adxl362_data *adxl362_data = dev->data; ret = adxl362_reg_access(adxl362_data, ADXL362_READ_REG, @@ -100,7 +100,7 @@ int adxl362_reg_write_mask(struct device *dev, uint8_t register_address, static inline int adxl362_get_reg(struct device *dev, uint8_t *read_buf, uint8_t register_address, uint8_t count) { - struct adxl362_data *adxl362_data = dev->driver_data; + struct adxl362_data *adxl362_data = dev->data; return adxl362_reg_access(adxl362_data, ADXL362_READ_REG, @@ -114,7 +114,7 @@ static int adxl362_interrupt_config(struct device *dev, uint8_t int2) { int ret; - struct adxl362_data *adxl362_data = dev->driver_data; + struct adxl362_data *adxl362_data = dev->data; ret = adxl362_reg_access(adxl362_data, ADXL362_WRITE_REG, @@ -235,7 +235,7 @@ static int32_t adxl362_range_to_reg_val(uint16_t range) static int adxl362_set_range(struct device *dev, uint8_t range) { - struct adxl362_data *adxl362_data = dev->driver_data; + struct adxl362_data *adxl362_data = dev->data; uint8_t old_filter_ctl; uint8_t new_filter_ctl; int ret; @@ -532,7 +532,7 @@ int adxl362_set_interrupt_mode(struct device *dev, uint8_t mode) static int adxl362_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct adxl362_data *data = dev->driver_data; + struct adxl362_data *data = dev->data; int16_t buf[4]; int ret; @@ -592,7 +592,7 @@ static int adxl362_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct adxl362_data *data = dev->driver_data; + struct adxl362_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: /* Acceleration on the X axis, in m/s^2. */ @@ -722,7 +722,7 @@ static int adxl362_chip_init(struct device *dev) static int adxl362_init(struct device *dev) { const struct adxl362_config *config = dev->config; - struct adxl362_data *data = dev->driver_data; + struct adxl362_data *data = dev->data; uint8_t value; int err; diff --git a/drivers/sensor/adxl362/adxl362_trigger.c b/drivers/sensor/adxl362/adxl362_trigger.c index 27c01c31f1f..92ec44e0b60 100644 --- a/drivers/sensor/adxl362/adxl362_trigger.c +++ b/drivers/sensor/adxl362/adxl362_trigger.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(ADXL362, CONFIG_SENSOR_LOG_LEVEL); static void adxl362_thread_cb(void *arg) { struct device *dev = arg; - struct adxl362_data *drv_data = dev->driver_data; + struct adxl362_data *drv_data = dev->data; uint8_t status_buf; /* Clears activity and inactivity interrupt */ @@ -61,7 +61,7 @@ static void adxl362_gpio_callback(struct device *dev, static void adxl362_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct adxl362_data *drv_data = dev->driver_data; + struct adxl362_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -84,7 +84,7 @@ int adxl362_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct adxl362_data *drv_data = dev->driver_data; + struct adxl362_data *drv_data = dev->data; uint8_t int_mask, int_en, status_buf; switch (trig->type) { @@ -122,7 +122,7 @@ int adxl362_trigger_set(struct device *dev, int adxl362_init_interrupt(struct device *dev) { - struct adxl362_data *drv_data = dev->driver_data; + struct adxl362_data *drv_data = dev->data; const struct adxl362_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c index ba07f6f2324..f4e1c738c12 100644 --- a/drivers/sensor/adxl372/adxl372.c +++ b/drivers/sensor/adxl372/adxl372.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(ADXL372, CONFIG_SENSOR_LOG_LEVEL); static int adxl372_bus_access(struct device *dev, uint8_t reg, void *data, size_t length) { - struct adxl372_data *adxl372_data = dev->driver_data; + struct adxl372_data *adxl372_data = dev->data; #ifdef CONFIG_ADXL372_SPI const struct spi_buf buf[2] = { @@ -536,7 +536,7 @@ static int adxl372_configure_fifo(struct device *dev, enum adxl372_fifo_format format, uint16_t fifo_samples) { - struct adxl372_data *data = dev->driver_data; + struct adxl372_data *data = dev->data; uint8_t fifo_config; int ret; @@ -691,7 +691,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; + struct adxl372_data *data = dev->data; const struct adxl372_dev_config *cfg = dev->config; return adxl372_get_accel_data(dev, cfg->max_peak_detect_mode, @@ -714,7 +714,7 @@ static int adxl372_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct adxl372_data *data = dev->driver_data; + struct adxl372_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: @@ -877,7 +877,7 @@ static int adxl372_probe(struct device *dev) static int adxl372_init(struct device *dev) { - struct adxl372_data *data = dev->driver_data; + struct adxl372_data *data = dev->data; const struct adxl372_dev_config *cfg = dev->config; #ifdef CONFIG_ADXL372_I2C diff --git a/drivers/sensor/adxl372/adxl372_trigger.c b/drivers/sensor/adxl372/adxl372_trigger.c index 2052d8aa92f..cc83e1464bf 100644 --- a/drivers/sensor/adxl372/adxl372_trigger.c +++ b/drivers/sensor/adxl372/adxl372_trigger.c @@ -19,7 +19,7 @@ LOG_MODULE_DECLARE(ADXL372, CONFIG_SENSOR_LOG_LEVEL); static void adxl372_thread_cb(void *arg) { struct device *dev = arg; - struct adxl372_data *drv_data = dev->driver_data; + struct adxl372_data *drv_data = dev->data; const struct adxl372_dev_config *cfg = dev->config; uint8_t status1, status2; @@ -72,7 +72,7 @@ static void adxl372_gpio_callback(struct device *dev, static void adxl372_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct adxl372_data *drv_data = dev->driver_data; + struct adxl372_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -96,7 +96,7 @@ int adxl372_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct adxl372_data *drv_data = dev->driver_data; + struct adxl372_data *drv_data = dev->data; const struct adxl372_dev_config *cfg = dev->config; uint8_t int_mask, int_en, status1, status2; int ret; @@ -140,7 +140,7 @@ out: int adxl372_init_interrupt(struct device *dev) { - struct adxl372_data *drv_data = dev->driver_data; + struct adxl372_data *drv_data = dev->data; const struct adxl372_dev_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->gpio_port); diff --git a/drivers/sensor/ak8975/ak8975.c b/drivers/sensor/ak8975/ak8975.c index 90d37e2262c..ef5ea7ea29c 100644 --- a/drivers/sensor/ak8975/ak8975.c +++ b/drivers/sensor/ak8975/ak8975.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(AK8975, CONFIG_SENSOR_LOG_LEVEL); static int ak8975_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct ak8975_data *drv_data = dev->driver_data; + struct ak8975_data *drv_data = dev->data; uint8_t buf[6]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -64,7 +64,7 @@ static int ak8975_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ak8975_data *drv_data = dev->driver_data; + struct ak8975_data *drv_data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_MAGN_XYZ || chan == SENSOR_CHAN_MAGN_X || @@ -118,7 +118,7 @@ static int ak8975_read_adjustment_data(struct ak8975_data *drv_data) int ak8975_init(struct device *dev) { - struct ak8975_data *drv_data = dev->driver_data; + struct ak8975_data *drv_data = dev->data; uint8_t id; drv_data->i2c = diff --git a/drivers/sensor/amg88xx/amg88xx.c b/drivers/sensor/amg88xx/amg88xx.c index 957d05417e0..2638809651e 100644 --- a/drivers/sensor/amg88xx/amg88xx.c +++ b/drivers/sensor/amg88xx/amg88xx.c @@ -23,7 +23,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; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -42,7 +42,7 @@ static int amg88xx_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; size_t len = ARRAY_SIZE(drv_data->sample); if (chan != SENSOR_CHAN_AMBIENT_TEMP) { @@ -65,7 +65,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; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; uint8_t tmp; @@ -105,7 +105,7 @@ static int amg88xx_init_device(struct device *dev) int amg88xx_init(struct device *dev) { - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; drv_data->i2c = device_get_binding(config->i2c_name); diff --git a/drivers/sensor/amg88xx/amg88xx_trigger.c b/drivers/sensor/amg88xx/amg88xx_trigger.c index 62afeeee98e..ffd82db57ad 100644 --- a/drivers/sensor/amg88xx/amg88xx_trigger.c +++ b/drivers/sensor/amg88xx/amg88xx_trigger.c @@ -35,7 +35,7 @@ int amg88xx_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; int16_t int_level = (val->val1 * 1000000 + val->val2) / AMG88XX_TREG_LSB_SCALING; @@ -91,7 +91,7 @@ static void amg88xx_gpio_callback(struct device *dev, static void amg88xx_thread_cb(void *arg) { struct device *dev = arg; - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; uint8_t status; @@ -115,7 +115,7 @@ static void amg88xx_thread_cb(void *arg) static void amg88xx_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -139,7 +139,7 @@ int amg88xx_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; if (i2c_reg_write_byte(drv_data->i2c, config->i2c_address, @@ -169,7 +169,7 @@ int amg88xx_trigger_set(struct device *dev, int amg88xx_init_interrupt(struct device *dev) { - struct amg88xx_data *drv_data = dev->driver_data; + struct amg88xx_data *drv_data = dev->data; const struct amg88xx_config *config = dev->config; /* setup gpio interrupt */ diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c index 6fa9f602e6a..afffd9535ff 100644 --- a/drivers/sensor/ams_iAQcore/iAQcore.c +++ b/drivers/sensor/ams_iAQcore/iAQcore.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(IAQ_CORE, CONFIG_SENSOR_LOG_LEVEL); static int iaqcore_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct iaq_core_data *drv_data = dev->driver_data; + struct iaq_core_data *drv_data = dev->data; struct iaq_registers buf; struct i2c_msg msg; int ret, tries; @@ -70,7 +70,7 @@ static int iaqcore_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct iaq_core_data *drv_data = dev->driver_data; + struct iaq_core_data *drv_data = dev->data; switch (chan) { case SENSOR_CHAN_CO2: @@ -99,7 +99,7 @@ static const struct sensor_driver_api iaq_core_driver_api = { static int iaq_core_init(struct device *dev) { - struct iaq_core_data *drv_data = dev->driver_data; + struct iaq_core_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index d86b9078550..e540c14cdb3 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -48,7 +48,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; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; uint8_t tmp; if (chan != SENSOR_CHAN_ALL) { @@ -117,7 +117,7 @@ static int apds9960_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; switch (chan) { #ifdef CONFIG_APDS9960_ENABLE_ALS @@ -152,7 +152,7 @@ static int apds9960_channel_get(struct device *dev, static int apds9960_proxy_setup(struct device *dev) { const struct apds9960_config *config = dev->config; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; if (i2c_reg_write_byte(data->i2c, config->i2c_address, APDS9960_POFFSET_UR_REG, @@ -224,7 +224,7 @@ static int apds9960_proxy_setup(struct device *dev) static int apds9960_ambient_setup(struct device *dev) { const struct apds9960_config *config = dev->config; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; uint16_t th; /* ADC value */ @@ -274,7 +274,7 @@ static int apds9960_ambient_setup(struct device *dev) static int apds9960_sensor_setup(struct device *dev) { const struct apds9960_config *config = dev->config; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; uint8_t chip_id; if (i2c_reg_read_byte(data->i2c, config->i2c_address, @@ -359,7 +359,7 @@ static int apds9960_sensor_setup(struct device *dev) static int apds9960_init_interrupt(struct device *dev) { const struct apds9960_config *config = dev->config; - struct apds9960_data *drv_data = dev->driver_data; + struct apds9960_data *drv_data = dev->data; /* setup gpio interrupt */ drv_data->gpio = device_get_binding(config->gpio_name); @@ -411,7 +411,7 @@ 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; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; int ret = 0; if (ctrl_command == DEVICE_PM_SET_POWER_STATE) { @@ -454,7 +454,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; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; /* Initialize time 5.7ms */ k_sleep(K_MSEC(6)); diff --git a/drivers/sensor/apds9960/apds9960_trigger.c b/drivers/sensor/apds9960/apds9960_trigger.c index 92f475121b2..367178055a1 100644 --- a/drivers/sensor/apds9960/apds9960_trigger.c +++ b/drivers/sensor/apds9960/apds9960_trigger.c @@ -37,7 +37,7 @@ int apds9960_attr_set(struct device *dev, const struct sensor_value *val) { const struct apds9960_config *config = dev->config; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; if (chan == SENSOR_CHAN_PROX) { if (attr == SENSOR_ATTR_UPPER_THRESH) { @@ -70,7 +70,7 @@ int apds9960_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { const struct apds9960_config *config = dev->config; - struct apds9960_data *data = dev->driver_data; + struct apds9960_data *data = dev->data; apds9960_setup_int(data, false); diff --git a/drivers/sensor/bma280/bma280.c b/drivers/sensor/bma280/bma280.c index f661f259b49..15c09af35d7 100644 --- a/drivers/sensor/bma280/bma280.c +++ b/drivers/sensor/bma280/bma280.c @@ -18,7 +18,7 @@ LOG_MODULE_REGISTER(BMA280, CONFIG_SENSOR_LOG_LEVEL); static int bma280_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; uint8_t buf[6]; uint8_t lsb; @@ -76,7 +76,7 @@ static int bma280_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; /* * See datasheet "Sensor data" section for @@ -115,7 +115,7 @@ static const struct sensor_driver_api bma280_driver_api = { int bma280_init(struct device *dev) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; uint8_t id = 0U; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/bma280/bma280_trigger.c b/drivers/sensor/bma280/bma280_trigger.c index bea3f4d0c5f..1bcd38201f0 100644 --- a/drivers/sensor/bma280/bma280_trigger.c +++ b/drivers/sensor/bma280/bma280_trigger.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(BMA280, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_int1(struct device *dev, bool enable) { - struct bma280_data *data = dev->driver_data; + struct bma280_data *data = dev->data; gpio_pin_interrupt_configure(data->gpio, DT_INST_GPIO_PIN(0, int1_gpios), @@ -34,7 +34,7 @@ int bma280_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; uint64_t slope_th; if (chan != SENSOR_CHAN_ACCEL_XYZ) { @@ -87,7 +87,7 @@ static void bma280_gpio_callback(struct device *dev, static void bma280_thread_cb(void *arg) { struct device *dev = arg; - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; uint8_t status = 0U; int err = 0; @@ -129,7 +129,7 @@ static void bma280_thread_cb(void *arg) static void bma280_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -154,7 +154,7 @@ int bma280_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; if (trig->type == SENSOR_TRIG_DATA_READY) { /* disable data ready interrupt while changing trigger params */ @@ -211,7 +211,7 @@ int bma280_trigger_set(struct device *dev, int bma280_init_interrupt(struct device *dev) { - struct bma280_data *drv_data = dev->driver_data; + struct bma280_data *drv_data = dev->data; /* set latched interrupts */ if (i2c_reg_write_byte(drv_data->i2c, BMA280_I2C_ADDRESS, diff --git a/drivers/sensor/bmc150_magn/bmc150_magn.c b/drivers/sensor/bmc150_magn/bmc150_magn.c index a3d3d3d73c5..6065c10d100 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn.c @@ -52,7 +52,7 @@ static int bmc150_magn_set_power_mode(struct device *dev, enum bmc150_magn_power_modes mode, int state) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; switch (mode) { @@ -90,7 +90,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; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t i; @@ -112,7 +112,7 @@ static int bmc150_magn_set_odr(struct device *dev, uint8_t val) #if defined(BMC150_MAGN_SET_ATTR) static int bmc150_magn_read_rep_xy(struct device *dev) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; @@ -128,7 +128,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; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; @@ -145,7 +145,7 @@ static int bmc150_magn_read_rep_z(struct device *dev) static int bmc150_magn_compute_max_odr(struct device *dev, int rep_xy, int rep_z, int *max_odr) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; if (rep_xy == 0) { if (data->rep_xy <= 0) { @@ -174,7 +174,7 @@ static int bmc150_magn_compute_max_odr(struct device *dev, int rep_xy, #if defined(BMC150_MAGN_SET_ATTR_REP) static int bmc150_magn_read_odr(struct device *dev) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t i, odr_val, reg_val; @@ -199,7 +199,7 @@ static int bmc150_magn_read_odr(struct device *dev) #if defined(CONFIG_BMC150_MAGN_SAMPLING_REP_XY) static int bmc150_magn_write_rep_xy(struct device *dev, int val) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -218,7 +218,7 @@ static int bmc150_magn_write_rep_xy(struct device *dev, int val) #if defined(CONFIG_BMC150_MAGN_SAMPLING_REP_Z) static int bmc150_magn_write_rep_z(struct device *dev, int val) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -291,7 +291,7 @@ static int32_t bmc150_magn_compensate_z(struct bmc150_magn_trim_regs *tregs, static int bmc150_magn_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint16_t values[BMC150_MAGN_AXIS_XYZR_MAX]; int16_t raw_x, raw_y, raw_z; @@ -336,7 +336,7 @@ static int bmc150_magn_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; switch (chan) { case SENSOR_CHAN_MAGN_X: @@ -365,7 +365,7 @@ static inline int bmc150_magn_attr_set_rep(struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; int max_odr; switch (chan) { @@ -436,7 +436,7 @@ static int bmc150_magn_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; switch (attr) { #if defined(CONFIG_BMC150_MAGN_SAMPLING_RATE_RUNTIME) @@ -484,7 +484,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; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t chip_id; struct bmc150_magn_preset preset; @@ -572,7 +572,7 @@ static int bmc150_magn_init(struct device *dev) { const struct bmc150_magn_config * const config = dev->config; - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { diff --git a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c index d4e6acc68da..0b17e9821a2 100644 --- a/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c +++ b/drivers/sensor/bmc150_magn/bmc150_magn_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(BMC150_MAGN, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_drdy(struct device *dev, bool enable) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *const cfg = dev->config; @@ -34,7 +34,7 @@ int bmc150_magn_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config * const config = dev->config; uint8_t state; @@ -85,7 +85,7 @@ static void bmc150_magn_gpio_drdy_callback(struct device *dev, 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; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; uint8_t reg_val; @@ -109,7 +109,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; + struct bmc150_magn_data *data = dev->data; const struct bmc150_magn_config *config = dev->config; if (state) { @@ -126,7 +126,7 @@ int bmc150_magn_init_interrupt(struct device *dev) { const struct bmc150_magn_config * const config = dev->config; - struct bmc150_magn_data *data = dev->driver_data; + struct bmc150_magn_data *data = dev->data; #if defined(CONFIG_BMC150_MAGN_TRIGGER_DRDY) diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index edf8fe4813e..c5aea460ef1 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -112,7 +112,7 @@ struct bme280_reg_io { static inline struct bme280_data *to_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct bme280_config *to_config(struct device *dev) diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c index dc0996176cd..382b521687e 100644 --- a/drivers/sensor/bme680/bme680.c +++ b/drivers/sensor/bme680/bme680.c @@ -190,7 +190,7 @@ static uint8_t bme680_calc_gas_wait(uint16_t dur) static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bme680_data *data = dev->driver_data; + struct bme680_data *data = dev->data; uint8_t buff[BME680_LEN_FIELD] = { 0 }; uint8_t gas_range; uint32_t adc_temp, adc_press; @@ -236,7 +236,7 @@ static int bme680_sample_fetch(struct device *dev, enum sensor_channel chan) static int bme680_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bme680_data *data = dev->driver_data; + struct bme680_data *data = dev->data; switch (chan) { case SENSOR_CHAN_AMBIENT_TEMP: @@ -341,7 +341,7 @@ static int bme680_read_compensation(struct bme680_data *data) static int bme680_chip_init(struct device *dev) { - struct bme680_data *data = (struct bme680_data *)dev->driver_data; + struct bme680_data *data = (struct bme680_data *)dev->data; int err; err = bme680_reg_read(data, BME680_REG_CHIP_ID, &data->chip_id, 1); @@ -400,7 +400,7 @@ static int bme680_chip_init(struct device *dev) static int bme680_init(struct device *dev) { - struct bme680_data *data = dev->driver_data; + struct bme680_data *data = dev->data; data->i2c_master = device_get_binding( DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/bmg160/bmg160.c b/drivers/sensor/bmg160/bmg160.c index 8549fcbc84d..a303f822d90 100644 --- a/drivers/sensor/bmg160/bmg160.c +++ b/drivers/sensor/bmg160/bmg160.c @@ -25,7 +25,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; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; uint32_t i2c_cfg; i2c_cfg = I2C_MODE_MASTER | I2C_SPEED_SET(dev_cfg->i2c_speed); @@ -37,7 +37,7 @@ 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; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; int ret = 0; bmg160_bus_config(dev); @@ -63,7 +63,7 @@ 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; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; int ret = 0; bmg160_bus_config(dev); @@ -89,7 +89,7 @@ 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; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; int ret = 0; bmg160_bus_config(dev); @@ -132,7 +132,7 @@ static int bmg160_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; int idx; uint16_t range_dps; @@ -190,7 +190,7 @@ static int bmg160_attr_set(struct device *dev, enum sensor_channel chan, static int bmg160_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; union { uint8_t raw[7]; struct { @@ -232,7 +232,7 @@ static void bmg160_to_fixed_point(struct bmg160_device_data *bmg160, static int bmg160_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; int16_t raw_val; int i; @@ -274,7 +274,7 @@ static const struct sensor_driver_api bmg160_api = { int bmg160_init(struct device *dev) { const struct bmg160_device_config *cfg = dev->config; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->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 f07117fc25e..31afeeefd8f 100644 --- a/drivers/sensor/bmg160/bmg160_trigger.c +++ b/drivers/sensor/bmg160/bmg160_trigger.c @@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(BMG160, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_int(struct device *dev, bool enable) { - struct bmg160_device_data *data = dev->driver_data; + struct bmg160_device_data *data = dev->data; const struct bmg160_device_config *const cfg = dev->config; @@ -51,7 +51,7 @@ static void bmg160_gpio_callback(struct device *port, struct gpio_callback *cb, static int bmg160_anymotion_set(struct device *dev, sensor_trigger_handler_t handler) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; uint8_t anymotion_en = 0U; if (handler) { @@ -72,7 +72,7 @@ static int bmg160_anymotion_set(struct device *dev, static int bmg160_drdy_set(struct device *dev, sensor_trigger_handler_t handler) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; if (bmg160_update_byte(dev, BMG160_REG_INT_EN0, BMG160_DATA_EN, @@ -88,7 +88,7 @@ static int bmg160_drdy_set(struct device *dev, sensor_trigger_handler_t handler) int bmg160_slope_config(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; if (attr == SENSOR_ATTR_SLOPE_TH) { uint16_t any_th_dps, range_dps; @@ -135,7 +135,7 @@ int bmg160_trigger_set(struct device *dev, static int bmg160_handle_anymotion_int(struct device *dev) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; struct sensor_trigger any_trig = { .type = SENSOR_TRIG_DELTA, .chan = SENSOR_CHAN_GYRO_XYZ, @@ -150,7 +150,7 @@ static int bmg160_handle_anymotion_int(struct device *dev) static int bmg160_handle_dataready_int(struct device *dev) { - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, .chan = SENSOR_CHAN_GYRO_XYZ, @@ -186,7 +186,7 @@ static struct k_thread bmg160_thread; static void bmg160_thread_main(void *arg1, void *arg2, void *arg3) { struct device *dev = (struct device *)arg1; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; while (true) { k_sem_take(&bmg160->trig_sem, K_FOREVER); @@ -209,7 +209,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; - struct bmg160_device_data *bmg160 = dev->driver_data; + struct bmg160_device_data *bmg160 = dev->data; /* set INT1 pin to: push-pull, active low */ if (bmg160_write_byte(dev, BMG160_REG_INT_EN1, 0) < 0) { diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c index 8d52213f9ac..434ecfaca35 100644 --- a/drivers/sensor/bmi160/bmi160.c +++ b/drivers/sensor/bmi160/bmi160.c @@ -26,7 +26,7 @@ struct bmi160_device_data bmi160_data; static int bmi160_transceive(struct device *dev, uint8_t reg, bool write, void *data, size_t length) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; const struct spi_buf buf[2] = { { .buf = ®, @@ -197,7 +197,7 @@ static int bmi160_freq_to_odr_val(uint16_t freq_int, uint16_t freq_milli) static int bmi160_acc_odr_set(struct device *dev, uint16_t freq_int, uint16_t freq_milli) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; int odr = bmi160_freq_to_odr_val(freq_int, freq_milli); if (odr < 0) { @@ -299,7 +299,7 @@ static int bmi160_do_calibration(struct device *dev, uint8_t foc_conf) #if defined(CONFIG_BMI160_ACCEL_RANGE_RUNTIME) static int bmi160_acc_range_set(struct device *dev, int32_t range) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; int32_t reg_val = bmi160_range_to_reg_val(range, bmi160_acc_range_map, BMI160_ACC_RANGE_MAP_SIZE); @@ -360,7 +360,7 @@ static int bmi160_acc_ofs_set(struct device *dev, enum sensor_channel chan, static int bmi160_acc_calibrate(struct device *dev, enum sensor_channel chan, const struct sensor_value *xyz_calib_value) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; uint8_t foc_pos[] = { BMI160_FOC_ACC_X_POS, BMI160_FOC_ACC_Y_POS, @@ -463,7 +463,7 @@ static int bmi160_gyr_odr_set(struct device *dev, uint16_t freq_int, #if defined(CONFIG_BMI160_GYRO_RANGE_RUNTIME) static int bmi160_gyr_range_set(struct device *dev, uint16_t range) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; int32_t reg_val = bmi160_range_to_reg_val(range, bmi160_gyr_range_map, BMI160_GYR_RANGE_MAP_SIZE); @@ -545,7 +545,7 @@ static int bmi160_gyr_ofs_set(struct device *dev, enum sensor_channel chan, static int bmi160_gyr_calibrate(struct device *dev, enum sensor_channel chan) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; ARG_UNUSED(chan); @@ -627,7 +627,7 @@ static int bmi160_attr_set(struct device *dev, enum sensor_channel chan, #endif static int bmi160_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; size_t i; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -709,7 +709,7 @@ static inline void bmi160_gyr_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; bmi160_channel_convert(chan, bmi160->scale.gyr, bmi160->sample.gyr, val); @@ -721,7 +721,7 @@ static inline void bmi160_acc_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; bmi160_channel_convert(chan, bmi160->scale.acc, bmi160->sample.acc, val); @@ -732,7 +732,7 @@ static int bmi160_temp_channel_get(struct device *dev, struct sensor_value *val) { uint16_t temp_raw = 0U; int32_t temp_micro = 0; - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; if (bmi160->pmu_sts.raw == 0U) { return -EINVAL; @@ -793,7 +793,7 @@ static const struct sensor_driver_api bmi160_api = { int bmi160_init(struct device *dev) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; uint8_t val = 0U; int32_t acc_range, gyr_range; diff --git a/drivers/sensor/bmi160/bmi160_trigger.c b/drivers/sensor/bmi160/bmi160_trigger.c index 7906c6991b7..4abd373f865 100644 --- a/drivers/sensor/bmi160/bmi160_trigger.c +++ b/drivers/sensor/bmi160/bmi160_trigger.c @@ -16,7 +16,7 @@ LOG_MODULE_DECLARE(BMI160, CONFIG_SENSOR_LOG_LEVEL); static void bmi160_handle_anymotion(struct device *dev) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; struct sensor_trigger anym_trigger = { .type = SENSOR_TRIG_DELTA, .chan = SENSOR_CHAN_ACCEL_XYZ, @@ -29,7 +29,7 @@ static void bmi160_handle_anymotion(struct device *dev) static void bmi160_handle_drdy(struct device *dev, uint8_t status) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -88,7 +88,7 @@ static void bmi160_thread_main(void *arg1, void *unused1, void *unused2) ARG_UNUSED(unused1); ARG_UNUSED(unused2); struct device *dev = (struct device *)arg1; - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; while (1) { k_sem_take(&bmi160->sem, K_FOREVER); @@ -129,7 +129,7 @@ static int bmi160_trigger_drdy_set(struct device *dev, enum sensor_channel chan, sensor_trigger_handler_t handler) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; uint8_t drdy_en = 0U; #if !defined(CONFIG_BMI160_ACCEL_PMU_SUSPEND) @@ -164,7 +164,7 @@ static int bmi160_trigger_drdy_set(struct device *dev, static int bmi160_trigger_anym_set(struct device *dev, sensor_trigger_handler_t handler) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; uint8_t anym_en = 0U; bmi160->handler_anymotion = handler; @@ -272,7 +272,7 @@ int bmi160_trigger_set(struct device *dev, int bmi160_trigger_mode_init(struct device *dev) { - struct bmi160_device_data *bmi160 = dev->driver_data; + struct bmi160_device_data *bmi160 = dev->data; const struct bmi160_device_config *cfg = dev->config; diff --git a/drivers/sensor/bmm150/bmm150.c b/drivers/sensor/bmm150/bmm150.c index df4bb720d05..0ade0a08602 100644 --- a/drivers/sensor/bmm150/bmm150.c +++ b/drivers/sensor/bmm150/bmm150.c @@ -40,7 +40,7 @@ static int bmm150_set_power_mode(struct device *dev, enum bmm150_power_modes mode, int state) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; switch (mode) { @@ -79,7 +79,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; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; uint8_t i; @@ -116,7 +116,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; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; uint8_t reg_val; @@ -133,7 +133,7 @@ static int bmm150_read_rep_z(struct device *dev) static int bmm150_compute_max_odr(struct device *dev, int rep_xy, int rep_z, int *max_odr) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; if (rep_xy == 0) { if (data->rep_xy <= 0) { @@ -163,7 +163,7 @@ static int bmm150_compute_max_odr(struct device *dev, int rep_xy, #if defined(BMM150_SET_ATTR_REP) static int bmm150_read_odr(struct device *dev) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; uint8_t i, odr_val, reg_val; @@ -188,7 +188,7 @@ static int bmm150_read_odr(struct device *dev) #if defined(CONFIG_BMM150_SAMPLING_REP_XY) static int bmm150_write_rep_xy(struct device *dev, int val) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; if (i2c_reg_update_byte(data->i2c, config->i2c_slave_addr, @@ -207,7 +207,7 @@ static int bmm150_write_rep_xy(struct device *dev, int val) #if defined(CONFIG_BMM150_SAMPLING_REP_Z) static int bmm150_write_rep_z(struct device *dev, int val) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; if (i2c_reg_update_byte(data->i2c, config->i2c_slave_addr, @@ -291,7 +291,7 @@ static int32_t bmm150_compensate_z(struct bmm150_trim_regs *tregs, static int bmm150_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bmm150_data *drv_data = dev->driver_data; + struct bmm150_data *drv_data = dev->data; const struct bmm150_config *config = dev->config; uint16_t values[BMM150_AXIS_XYZR_MAX]; int16_t raw_x, raw_y, raw_z; @@ -342,7 +342,7 @@ static int bmm150_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bmm150_data *drv_data = dev->driver_data; + struct bmm150_data *drv_data = dev->data; switch (chan) { case SENSOR_CHAN_MAGN_X: @@ -371,7 +371,7 @@ static inline int bmm150_attr_set_rep(struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; int max_odr; switch (chan) { @@ -443,7 +443,7 @@ static int bmm150_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct bmm150_magn_data *data = dev->driver_data; + struct bmm150_magn_data *data = dev->data; switch (attr) { #if defined(CONFIG_BMM150_SAMPLING_RATE_RUNTIME) @@ -488,7 +488,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; + struct bmm150_data *data = dev->data; const struct bmm150_config *config = dev->config; uint8_t chip_id; struct bmm150_preset preset; @@ -582,7 +582,7 @@ static int bmm150_init(struct device *dev) { const struct bmm150_config *const config = dev->config; - struct bmm150_data *data = dev->driver_data; + struct bmm150_data *data = dev->data; data->i2c = device_get_binding(config->i2c_master_dev_name); if (!data->i2c) { diff --git a/drivers/sensor/bq274xx/bq274xx.c b/drivers/sensor/bq274xx/bq274xx.c index 483368a26b2..329ff213898 100644 --- a/drivers/sensor/bq274xx/bq274xx.c +++ b/drivers/sensor/bq274xx/bq274xx.c @@ -135,7 +135,7 @@ static int bq274xx_get_device_type(struct bq274xx_data *bq274xx, uint16_t *val) static int bq274xx_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct bq274xx_data *bq274xx = dev->driver_data; + struct bq274xx_data *bq274xx = dev->data; float int_temp; switch (chan) { @@ -211,7 +211,7 @@ static int bq274xx_channel_get(struct device *dev, enum sensor_channel chan, static int bq274xx_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct bq274xx_data *bq274xx = dev->driver_data; + struct bq274xx_data *bq274xx = dev->data; int status = 0; switch (chan) { @@ -350,7 +350,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; + struct bq274xx_data *bq274xx = dev->data; const struct bq274xx_config *const config = dev->config; int status = 0; uint8_t tmp_checksum = 0, checksum_old = 0, checksum_new = 0; diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c index c2aed6058ab..bc900e9bc71 100644 --- a/drivers/sensor/ccs811/ccs811.c +++ b/drivers/sensor/ccs811/ccs811.c @@ -76,7 +76,7 @@ static inline uint8_t error_from_status(int status) const struct ccs811_result_type *ccs811_result(struct device *dev) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; return &drv_data->result; } @@ -84,7 +84,7 @@ const struct ccs811_result_type *ccs811_result(struct device *dev) int ccs811_configver_fetch(struct device *dev, struct ccs811_configver_type *ptr) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; uint8_t cmd; int rc; @@ -129,7 +129,7 @@ int ccs811_configver_fetch(struct device *dev, int ccs811_baseline_fetch(struct device *dev) { const uint8_t cmd = CCS811_REG_BASELINE; - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; int rc; uint16_t baseline; @@ -149,7 +149,7 @@ int ccs811_baseline_fetch(struct device *dev) int ccs811_baseline_update(struct device *dev, uint16_t baseline) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; uint8_t buf[1 + sizeof(baseline)]; int rc; @@ -165,7 +165,7 @@ int ccs811_envdata_update(struct device *dev, const struct sensor_value *temperature, const struct sensor_value *humidity) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; int rc; uint8_t buf[5] = { CCS811_REG_ENV_DATA }; @@ -231,7 +231,7 @@ int ccs811_envdata_update(struct device *dev, static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; struct ccs811_result_type *rp = &drv_data->result; const uint8_t cmd = CCS811_REG_ALG_RESULT_DATA; int rc; @@ -270,7 +270,7 @@ static int ccs811_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; const struct ccs811_result_type *rp = &drv_data->result; uint32_t uval; @@ -376,7 +376,7 @@ int ccs811_mutate_meas_mode(struct device *dev, uint8_t set, uint8_t clear) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; int rc = 0; uint8_t mode = set | (drv_data->mode & ~clear); @@ -411,7 +411,7 @@ int ccs811_mutate_meas_mode(struct device *dev, int ccs811_set_thresholds(struct device *dev) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; const uint8_t buf[5] = { CCS811_REG_THRESHOLDS, drv_data->co2_l2m >> 8, @@ -431,7 +431,7 @@ int ccs811_set_thresholds(struct device *dev) static int ccs811_init(struct device *dev) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; int ret = 0; int status; uint16_t fw_ver; diff --git a/drivers/sensor/ccs811/ccs811_trigger.c b/drivers/sensor/ccs811/ccs811_trigger.c index ba5d49a83af..e815614d365 100644 --- a/drivers/sensor/ccs811/ccs811_trigger.c +++ b/drivers/sensor/ccs811/ccs811_trigger.c @@ -20,7 +20,7 @@ int ccs811_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *thr) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; int rc; if (chan != SENSOR_CHAN_CO2) { @@ -48,7 +48,7 @@ int ccs811_attr_set(struct device *dev, static inline void setup_irq(struct device *dev, bool enable) { - struct ccs811_data *data = dev->driver_data; + struct ccs811_data *data = dev->data; unsigned int flags = enable ? GPIO_INT_LEVEL_ACTIVE : GPIO_INT_DISABLE; @@ -58,7 +58,7 @@ static inline void setup_irq(struct device *dev, static inline void handle_irq(struct device *dev) { - struct ccs811_data *data = dev->driver_data; + struct ccs811_data *data = dev->data; setup_irq(dev, false); @@ -71,7 +71,7 @@ static inline void handle_irq(struct device *dev) static void process_irq(struct device *dev) { - struct ccs811_data *data = dev->driver_data; + struct ccs811_data *data = dev->data; if (data->handler != NULL) { data->handler(dev, &data->trigger); @@ -98,7 +98,7 @@ static void gpio_callback(struct device *dev, static void irq_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -122,7 +122,7 @@ int ccs811_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; uint8_t drdy_thresh = CCS811_MODE_THRESH | CCS811_MODE_DATARDY; int rc; @@ -170,7 +170,7 @@ int ccs811_trigger_set(struct device *dev, int ccs811_init_interrupt(struct device *dev) { - struct ccs811_data *drv_data = dev->driver_data; + struct ccs811_data *drv_data = dev->data; drv_data->dev = dev; diff --git a/drivers/sensor/dht/dht.c b/drivers/sensor/dht/dht.c index faf81a0d67a..1fbf15ddf4f 100644 --- a/drivers/sensor/dht/dht.c +++ b/drivers/sensor/dht/dht.c @@ -31,7 +31,7 @@ LOG_MODULE_REGISTER(DHT, CONFIG_SENSOR_LOG_LEVEL); static int8_t dht_measure_signal_duration(struct device *dev, bool active) { - struct dht_data *drv_data = dev->driver_data; + struct dht_data *drv_data = dev->data; const struct dht_config *cfg = dev->config; uint32_t elapsed_cycles; uint32_t max_wait_cycles = (uint32_t)( @@ -59,7 +59,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; + struct dht_data *drv_data = dev->data; const struct dht_config *cfg = dev->config; int ret = 0; int8_t signal_duration[DHT_DATA_BITS_NUM]; @@ -168,7 +168,7 @@ static int dht_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct dht_data *drv_data = dev->driver_data; + struct dht_data *drv_data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_AMBIENT_TEMP || chan == SENSOR_CHAN_HUMIDITY); @@ -224,7 +224,7 @@ static const struct sensor_driver_api dht_api = { static int dht_init(struct device *dev) { int rc = 0; - struct dht_data *drv_data = dev->driver_data; + struct dht_data *drv_data = dev->data; const struct dht_config *cfg = dev->config; drv_data->gpio = device_get_binding(cfg->ctrl); diff --git a/drivers/sensor/dps310/dps310.c b/drivers/sensor/dps310/dps310.c index 8e18672826d..d64fe34d9d4 100644 --- a/drivers/sensor/dps310/dps310.c +++ b/drivers/sensor/dps310/dps310.c @@ -571,7 +571,7 @@ static bool dps310_measure_tmp(struct dps310_data *data, /* Initialize the sensor and apply the configuration */ static int dps310_init(struct device *dev) { - struct dps310_data *data = dev->driver_data; + struct dps310_data *data = dev->data; const struct dps310_cfg *config = dev->config; data->i2c_master = device_get_binding(config->i2c_bus_name); @@ -663,7 +663,7 @@ static int dps310_init(struct device *dev) /* Do a measurement and fetch the data from the sensor */ static int dps310_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct dps310_data *data = dev->driver_data; + struct dps310_data *data = dev->data; const struct dps310_cfg *config = dev->config; LOG_DBG("Fetching sample from DPS310"); @@ -698,7 +698,7 @@ static int dps310_sample_fetch(struct device *dev, enum sensor_channel chan) static int dps310_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct dps310_data *data = dev->driver_data; + struct dps310_data *data = dev->data; switch (chan) { case SENSOR_CHAN_AMBIENT_TEMP: diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c index 5e6d887afb7..72b18e1afe9 100644 --- a/drivers/sensor/ens210/ens210.c +++ b/drivers/sensor/ens210/ens210.c @@ -80,7 +80,7 @@ static int ens210_measure(struct device *i2c_dev, enum sensor_channel chan) static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct ens210_data *drv_data = dev->driver_data; + struct ens210_data *drv_data = dev->data; struct ens210_value_data data[2]; int ret, cnt; @@ -161,7 +161,7 @@ static int ens210_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ens210_data *drv_data = dev->driver_data; + struct ens210_data *drv_data = dev->data; int32_t temp_frac; int32_t humidity_frac; @@ -265,7 +265,7 @@ static const struct sensor_driver_api en210_driver_api = { static int ens210_init(struct device *dev) { - struct ens210_data *drv_data = dev->driver_data; + struct ens210_data *drv_data = dev->data; const struct ens210_sens_run sense_run = { .t_run = ENS210_T_RUN, .h_run = ENS210_H_RUN diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c index 74e370607b4..93b5c99ee78 100644 --- a/drivers/sensor/fxas21002/fxas21002.c +++ b/drivers/sensor/fxas21002/fxas21002.c @@ -21,7 +21,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; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; uint8_t buffer[FXAS21002_MAX_NUM_BYTES]; int16_t *raw; int ret = 0; @@ -74,7 +74,7 @@ static int fxas21002_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { const struct fxas21002_config *config = dev->config; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; int start_channel; int num_channels; int16_t *raw; @@ -133,7 +133,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; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; uint8_t val = *power; if (i2c_reg_read_byte(data->i2c, config->i2c_address, @@ -151,7 +151,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; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; return i2c_reg_update_byte(data->i2c, config->i2c_address, FXAS21002_REG_CTRLREG1, @@ -187,7 +187,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; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; uint32_t transition_time; uint8_t whoami; uint8_t ctrlreg1; diff --git a/drivers/sensor/fxas21002/fxas21002_trigger.c b/drivers/sensor/fxas21002/fxas21002_trigger.c index ea2078c8b2c..d3ab9771729 100644 --- a/drivers/sensor/fxas21002/fxas21002_trigger.c +++ b/drivers/sensor/fxas21002/fxas21002_trigger.c @@ -33,7 +33,7 @@ static void fxas21002_gpio_callback(struct device *dev, static int fxas21002_handle_drdy_int(struct device *dev) { - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, @@ -51,7 +51,7 @@ static void fxas21002_handle_int(void *arg) { struct device *dev = (struct device *)arg; const struct fxas21002_config *config = dev->config; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; uint8_t int_source; k_sem_take(&data->sem, K_FOREVER); @@ -77,7 +77,7 @@ static void fxas21002_handle_int(void *arg) static void fxas21002_thread_main(void *arg1, void *unused1, void *unused2) { struct device *dev = (struct device *)arg1; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; ARG_UNUSED(unused1); ARG_UNUSED(unused2); @@ -104,7 +104,7 @@ int fxas21002_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { const struct fxas21002_config *config = dev->config; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; enum fxas21002_power power = FXAS21002_POWER_STANDBY; uint32_t transition_time; uint8_t mask; @@ -172,7 +172,7 @@ exit: int fxas21002_trigger_init(struct device *dev) { const struct fxas21002_config *config = dev->config; - struct fxas21002_data *data = dev->driver_data; + struct fxas21002_data *data = dev->data; uint8_t ctrl_reg2; #if defined(CONFIG_FXAS21002_TRIGGER_OWN_THREAD) diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index e7d2eea79c6..6f22cc43c44 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -18,7 +18,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; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; int32_t dr = val->val1; #ifdef CONFIG_FXOS8700_MODE_HYBRID @@ -76,7 +76,7 @@ static int fxos8700_set_mt_ths(struct device *dev, { #ifdef CONFIG_FXOS8700_MOTION const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; uint64_t micro_ms2 = abs(val->val1 * 1000000LL + val->val2); uint64_t ths = micro_ms2 / FXOS8700_FF_MT_THS_SCALE; @@ -118,7 +118,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; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; uint8_t buffer[FXOS8700_MAX_NUM_BYTES]; uint8_t num_bytes; int16_t *raw; @@ -235,7 +235,7 @@ static int fxos8700_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; int start_channel; int num_channels; int16_t *raw; @@ -342,7 +342,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; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; uint8_t val = *power; if (i2c_reg_read_byte(data->i2c, config->i2c_address, @@ -360,7 +360,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; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; return i2c_reg_update_byte(data->i2c, config->i2c_address, FXOS8700_REG_CTRLREG1, @@ -371,7 +371,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; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->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 863cc591315..e223ac583e0 100644 --- a/drivers/sensor/fxos8700/fxos8700_trigger.c +++ b/drivers/sensor/fxos8700/fxos8700_trigger.c @@ -33,7 +33,7 @@ static void fxos8700_gpio_callback(struct device *dev, static int fxos8700_handle_drdy_int(struct device *dev) { - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, @@ -51,7 +51,7 @@ static int fxos8700_handle_drdy_int(struct device *dev) static int fxos8700_handle_pulse_int(struct device *dev) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; sensor_trigger_handler_t handler = NULL; uint8_t pulse_source; @@ -89,7 +89,7 @@ static int fxos8700_handle_pulse_int(struct device *dev) static int fxos8700_handle_motion_int(struct device *dev) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; sensor_trigger_handler_t handler = data->motion_handler; uint8_t motion_source; @@ -120,7 +120,7 @@ static void fxos8700_handle_int(void *arg) { struct device *dev = (struct device *)arg; const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; uint8_t int_source; k_sem_take(&data->sem, K_FOREVER); @@ -156,7 +156,7 @@ static void fxos8700_handle_int(void *arg) static void fxos8700_thread_main(void *arg1, void *unused1, void *unused2) { struct device *dev = (struct device *)arg1; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; ARG_UNUSED(unused1); ARG_UNUSED(unused2); @@ -183,7 +183,7 @@ int fxos8700_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; enum fxos8700_power power = FXOS8700_POWER_STANDBY; uint8_t mask; int ret = 0; @@ -261,7 +261,7 @@ exit: static int fxos8700_pulse_init(struct device *dev) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; if (i2c_reg_write_byte(data->i2c, config->i2c_address, FXOS8700_REG_PULSE_CFG, config->pulse_cfg)) { @@ -306,7 +306,7 @@ static int fxos8700_pulse_init(struct device *dev) static int fxos8700_motion_init(struct device *dev) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; /* Set Mode 4, Motion detection with ELE = 1, OAE = 1 */ if (i2c_reg_write_byte(data->i2c, config->i2c_address, @@ -334,7 +334,7 @@ static int fxos8700_motion_init(struct device *dev) int fxos8700_trigger_init(struct device *dev) { const struct fxos8700_config *config = dev->config; - struct fxos8700_data *data = dev->driver_data; + struct fxos8700_data *data = dev->data; uint8_t ctrl_reg5; #if defined(CONFIG_FXOS8700_TRIGGER_OWN_THREAD) diff --git a/drivers/sensor/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c index 84d4b36f727..f9ffacfbe81 100644 --- a/drivers/sensor/grove/light_sensor.c +++ b/drivers/sensor/grove/light_sensor.c @@ -49,7 +49,7 @@ static struct adc_sequence adc_table = { static int gls_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct gls_data *drv_data = dev->driver_data; + struct gls_data *drv_data = dev->data; return adc_read(drv_data->adc, &adc_table); } @@ -58,7 +58,7 @@ static int gls_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct gls_data *drv_data = dev->driver_data; + struct gls_data *drv_data = dev->data; uint16_t analog_val = drv_data->raw; double ldr_val, dval; @@ -83,7 +83,7 @@ static const struct sensor_driver_api gls_api = { static int gls_init(struct device *dev) { - struct gls_data *drv_data = dev->driver_data; + struct gls_data *drv_data = dev->data; 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 7a14ab4f8a7..92045381741 100644 --- a/drivers/sensor/grove/temperature_sensor.c +++ b/drivers/sensor/grove/temperature_sensor.c @@ -49,7 +49,7 @@ static struct adc_sequence adc_table = { static int gts_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct gts_data *drv_data = dev->driver_data; + struct gts_data *drv_data = dev->data; return adc_read(drv_data->adc, &adc_table); } @@ -58,7 +58,7 @@ static int gts_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct gts_data *drv_data = dev->driver_data; + struct gts_data *drv_data = dev->data; const struct gts_config *cfg = dev->config; double dval; @@ -86,7 +86,7 @@ static const struct sensor_driver_api gts_api = { static int gts_init(struct device *dev) { - struct gts_data *drv_data = dev->driver_data; + struct gts_data *drv_data = dev->data; const struct gts_config *cfg = dev->config; drv_data->adc = device_get_binding(cfg->adc_label); diff --git a/drivers/sensor/hmc5883l/hmc5883l.c b/drivers/sensor/hmc5883l/hmc5883l.c index 8d5fd8f6cb0..b5cb1f76bed 100644 --- a/drivers/sensor/hmc5883l/hmc5883l.c +++ b/drivers/sensor/hmc5883l/hmc5883l.c @@ -30,7 +30,7 @@ static int hmc5883l_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; if (chan == SENSOR_CHAN_MAGN_X) { hmc5883l_convert(val, drv_data->x_sample, @@ -55,7 +55,7 @@ static int hmc5883l_channel_get(struct device *dev, static int hmc5883l_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; int16_t buf[3]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -85,7 +85,7 @@ static const struct sensor_driver_api hmc5883l_driver_api = { int hmc5883l_init(struct device *dev) { - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; uint8_t chip_cfg[3], id[3], idx; drv_data->i2c = device_get_binding( diff --git a/drivers/sensor/hmc5883l/hmc5883l_trigger.c b/drivers/sensor/hmc5883l/hmc5883l_trigger.c index 3090fc9eaab..a466a14e80c 100644 --- a/drivers/sensor/hmc5883l/hmc5883l_trigger.c +++ b/drivers/sensor/hmc5883l/hmc5883l_trigger.c @@ -21,7 +21,7 @@ int hmc5883l_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); @@ -65,7 +65,7 @@ static void hmc5883l_gpio_callback(struct device *dev, static void hmc5883l_thread_cb(void *arg) { struct device *dev = arg; - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; if (drv_data->data_ready_handler != NULL) { drv_data->data_ready_handler(dev, @@ -81,7 +81,7 @@ static void hmc5883l_thread_cb(void *arg) static void hmc5883l_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -104,7 +104,7 @@ static void hmc5883l_work_cb(struct k_work *work) int hmc5883l_init_interrupt(struct device *dev) { - struct hmc5883l_data *drv_data = dev->driver_data; + struct hmc5883l_data *drv_data = dev->data; /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding( diff --git a/drivers/sensor/hp206c/hp206c.c b/drivers/sensor/hp206c/hp206c.c index cf64e952920..48990df6051 100644 --- a/drivers/sensor/hp206c/hp206c.c +++ b/drivers/sensor/hp206c/hp206c.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(HP206C, CONFIG_SENSOR_LOG_LEVEL); static inline int hp206c_bus_config(struct device *dev) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; uint32_t i2c_cfg; i2c_cfg = I2C_MODE_MASTER | I2C_SPEED_SET(I2C_SPEED_STANDARD); @@ -35,7 +35,7 @@ static inline int hp206c_bus_config(struct device *dev) static int hp206c_read(struct device *dev, uint8_t cmd, uint8_t *data, uint8_t len) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; hp206c_bus_config(dev); @@ -58,7 +58,7 @@ static int hp206c_read_reg(struct device *dev, uint8_t reg_addr, static int hp206c_write(struct device *dev, uint8_t cmd, uint8_t *data, uint8_t len) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; hp206c_bus_config(dev); @@ -80,7 +80,7 @@ static int hp206c_write_reg(struct device *dev, uint8_t reg_addr, static int hp206c_cmd_send(struct device *dev, uint8_t cmd) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; hp206c_bus_config(dev); @@ -106,7 +106,7 @@ static uint8_t hp206c_adc_time_ms[] = { static int hp206c_osr_set(struct device *dev, uint16_t osr) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; uint8_t i; /* the following code translates OSR values to an index */ @@ -165,7 +165,7 @@ static int hp206c_attr_set(struct device *dev, enum sensor_channel chan, static int hp206c_wait_dev_ready(struct device *dev, uint32_t timeout_ms) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; uint8_t int_src; k_timer_start(&hp206c->tmr, K_MSEC(timeout_ms), K_NO_WAIT); @@ -184,7 +184,7 @@ static int hp206c_wait_dev_ready(struct device *dev, uint32_t timeout_ms) static int hp206c_adc_acquire(struct device *dev, enum sensor_channel chan) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; if (hp206c_cmd_send(dev, HP206C_CMD_ADC_CVT | (hp206c->osr << 2)) < 0) { return -EIO; @@ -284,7 +284,7 @@ static const struct sensor_driver_api hp206c_api = { static int hp206c_init(struct device *dev) { - struct hp206c_device_data *hp206c = dev->driver_data; + struct hp206c_device_data *hp206c = dev->data; hp206c->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (!hp206c->i2c) { diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c index 439f279d41e..7705825adc6 100644 --- a/drivers/sensor/hts221/hts221.c +++ b/drivers/sensor/hts221/hts221.c @@ -26,7 +26,7 @@ static int hts221_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; int32_t conv_val; /* @@ -60,7 +60,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; + struct hts221_data *data = dev->data; const struct hts221_config *cfg = dev->config; uint8_t buf[4]; @@ -81,7 +81,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; + struct hts221_data *data = dev->data; const struct hts221_config *cfg = dev->config; uint8_t buf[16]; @@ -115,7 +115,7 @@ static const struct sensor_driver_api hts221_driver_api = { int hts221_init(struct device *dev) { const struct hts221_config *cfg = dev->config; - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; uint8_t id, idx; data->i2c = device_get_binding(cfg->i2c_bus); diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c index 87b7933a5fe..14081a77964 100644 --- a/drivers/sensor/hts221/hts221_trigger.c +++ b/drivers/sensor/hts221/hts221_trigger.c @@ -18,7 +18,7 @@ LOG_MODULE_DECLARE(HTS221, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_drdy(struct device *dev, bool enable) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; const struct hts221_config *cfg = dev->config; unsigned int flags = enable ? GPIO_INT_EDGE_TO_ACTIVE @@ -29,7 +29,7 @@ static inline void setup_drdy(struct device *dev, static inline void handle_drdy(struct device *dev) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; setup_drdy(dev, false); @@ -42,7 +42,7 @@ static inline void handle_drdy(struct device *dev) static void process_drdy(struct device *dev) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; if (data->data_ready_handler != NULL) { data->data_ready_handler(dev, &data->data_ready_trigger); @@ -57,7 +57,7 @@ int hts221_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; const struct hts221_config *cfg = dev->config; __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); @@ -98,7 +98,7 @@ static void hts221_drdy_callback(struct device *dev, static void hts221_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; ARG_UNUSED(unused); @@ -121,7 +121,7 @@ static void hts221_work_cb(struct k_work *work) int hts221_init_interrupt(struct device *dev) { - struct hts221_data *data = dev->driver_data; + struct hts221_data *data = dev->data; 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 2997f0c1fe1..db7f3f5df62 100644 --- a/drivers/sensor/iis2dh/iis2dh.c +++ b/drivers/sensor/iis2dh/iis2dh.c @@ -74,7 +74,7 @@ static int iis2dh_set_fs_raw(struct iis2dh_data *iis2dh, uint8_t fs) static int iis2dh_set_range(struct device *dev, uint16_t range) { int err; - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; uint8_t fs = IIS2DH_FS_TO_REG(range); err = iis2dh_set_fs_raw(iis2dh, fs); @@ -91,7 +91,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; + struct iis2dh_data *iis2dh = dev->data; const struct iis2dh_device_config *cfg = dev->config; iis2dh_odr_t val; @@ -119,7 +119,7 @@ static inline void iis2dh_channel_get_acc(struct device *dev, { int i; uint8_t ofs_start, ofs_stop; - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -202,7 +202,7 @@ static int iis2dh_attr_set(struct device *dev, enum sensor_channel chan, static int iis2dh_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; union axis3bit16_t buf; /* fetch raw data sample */ @@ -229,7 +229,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; + struct iis2dh_data *iis2dh = dev->data; const struct iis2dh_device_config *cfg = dev->config; iis2dh->bus = device_get_binding(cfg->bus_name); @@ -251,7 +251,7 @@ static int iis2dh_init_interface(struct device *dev) static int iis2dh_init(struct device *dev) { - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; const struct iis2dh_device_config *cfg = dev->config; uint8_t wai; diff --git a/drivers/sensor/iis2dh/iis2dh_i2c.c b/drivers/sensor/iis2dh/iis2dh_i2c.c index 9ead441086b..c0145fafb93 100644 --- a/drivers/sensor/iis2dh/iis2dh_i2c.c +++ b/drivers/sensor/iis2dh/iis2dh_i2c.c @@ -43,7 +43,7 @@ stmdev_ctx_t iis2dh_i2c_ctx = { int iis2dh_i2c_init(struct device *dev) { - struct iis2dh_data *data = dev->driver_data; + struct iis2dh_data *data = dev->data; data->ctx = &iis2dh_i2c_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/iis2dh/iis2dh_spi.c b/drivers/sensor/iis2dh/iis2dh_spi.c index 5aba5d7349b..1819a0080c6 100644 --- a/drivers/sensor/iis2dh/iis2dh_spi.c +++ b/drivers/sensor/iis2dh/iis2dh_spi.c @@ -99,7 +99,7 @@ stmdev_ctx_t iis2dh_spi_ctx = { int iis2dh_spi_init(struct device *dev) { - struct iis2dh_data *data = dev->driver_data; + struct iis2dh_data *data = dev->data; data->ctx = &iis2dh_spi_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/iis2dh/iis2dh_trigger.c b/drivers/sensor/iis2dh/iis2dh_trigger.c index ad2684401c2..fd3ecf1f3d7 100644 --- a/drivers/sensor/iis2dh/iis2dh_trigger.c +++ b/drivers/sensor/iis2dh/iis2dh_trigger.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(IIS2DH, CONFIG_SENSOR_LOG_LEVEL); static int iis2dh_enable_drdy(struct device *dev, enum sensor_trigger_type type, int enable) { - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; iis2dh_ctrl_reg3_t reg3; /* set interrupt for pin INT1 */ @@ -41,7 +41,7 @@ int iis2dh_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; union axis3bit16_t raw; int state = (handler != NULL) ? PROPERTY_ENABLE : PROPERTY_DISABLE; @@ -61,7 +61,7 @@ int iis2dh_trigger_set(struct device *dev, static int iis2dh_handle_drdy_int(struct device *dev) { - struct iis2dh_data *data = dev->driver_data; + struct iis2dh_data *data = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, @@ -82,7 +82,7 @@ static int iis2dh_handle_drdy_int(struct device *dev) static void iis2dh_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; const struct iis2dh_device_config *cfg = dev->config; iis2dh_handle_drdy_int(dev); @@ -115,7 +115,7 @@ static void iis2dh_gpio_callback(struct device *dev, static void iis2dh_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; ARG_UNUSED(unused); @@ -138,7 +138,7 @@ static void iis2dh_work_cb(struct k_work *work) int iis2dh_init_interrupt(struct device *dev) { - struct iis2dh_data *iis2dh = dev->driver_data; + struct iis2dh_data *iis2dh = dev->data; const struct iis2dh_device_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc.c b/drivers/sensor/iis2dlpc/iis2dlpc.c index 2e20017caf4..0dbff40ce9a 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc.c @@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(IIS2DLPC, CONFIG_SENSOR_LOG_LEVEL); static int iis2dlpc_set_range(struct device *dev, uint16_t range) { int err; - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; uint8_t shift_gain = 0U; uint8_t fs = IIS2DLPC_FS_TO_REG(range); @@ -62,7 +62,7 @@ static int iis2dlpc_set_range(struct device *dev, uint16_t range) */ static int iis2dlpc_set_odr(struct device *dev, uint16_t odr) { - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; uint8_t val; /* check if power off */ @@ -98,7 +98,7 @@ static inline void iis2dlpc_channel_get_acc(struct device *dev, { int i; uint8_t ofs_start, ofs_stop; - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -177,7 +177,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; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; uint8_t shift; union axis3bit16_t buf; @@ -213,7 +213,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; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; iis2dlpc->bus = device_get_binding(cfg->bus_name); @@ -255,7 +255,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; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; uint8_t wai; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c index 7af3ec00319..e24abbbdd48 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_i2c.c @@ -43,7 +43,7 @@ stmdev_ctx_t iis2dlpc_i2c_ctx = { int iis2dlpc_i2c_init(struct device *dev) { - struct iis2dlpc_data *data = dev->driver_data; + struct iis2dlpc_data *data = dev->data; data->ctx = &iis2dlpc_i2c_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c index 2656c153938..826b5135572 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_spi.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_spi.c @@ -99,7 +99,7 @@ stmdev_ctx_t iis2dlpc_spi_ctx = { int iis2dlpc_spi_init(struct device *dev) { - struct iis2dlpc_data *data = dev->driver_data; + struct iis2dlpc_data *data = dev->data; data->ctx = &iis2dlpc_spi_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c index 95204350f00..e0529af5e3a 100644 --- a/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c +++ b/drivers/sensor/iis2dlpc/iis2dlpc_trigger.c @@ -26,7 +26,7 @@ static int iis2dlpc_enable_int(struct device *dev, enum sensor_trigger_type type, int enable) { const struct iis2dlpc_device_config *cfg = dev->config; - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; iis2dlpc_reg_t int_route; if (cfg->int_pin == 1U) { @@ -79,7 +79,7 @@ int iis2dlpc_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; union axis3bit16_t raw; int state = (handler != NULL) ? PROPERTY_ENABLE : PROPERTY_DISABLE; @@ -107,7 +107,7 @@ int iis2dlpc_trigger_set(struct device *dev, static int iis2dlpc_handle_drdy_int(struct device *dev) { - struct iis2dlpc_data *data = dev->driver_data; + struct iis2dlpc_data *data = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, @@ -124,7 +124,7 @@ static int iis2dlpc_handle_drdy_int(struct device *dev) #ifdef CONFIG_IIS2DLPC_PULSE static int iis2dlpc_handle_single_tap_int(struct device *dev) { - struct iis2dlpc_data *data = dev->driver_data; + struct iis2dlpc_data *data = dev->data; sensor_trigger_handler_t handler = data->tap_handler; struct sensor_trigger pulse_trig = { @@ -141,7 +141,7 @@ static int iis2dlpc_handle_single_tap_int(struct device *dev) static int iis2dlpc_handle_double_tap_int(struct device *dev) { - struct iis2dlpc_data *data = dev->driver_data; + struct iis2dlpc_data *data = dev->data; sensor_trigger_handler_t handler = data->double_tap_handler; struct sensor_trigger pulse_trig = { @@ -164,7 +164,7 @@ static int iis2dlpc_handle_double_tap_int(struct device *dev) static void iis2dlpc_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; iis2dlpc_all_sources_t sources; @@ -210,7 +210,7 @@ static void iis2dlpc_gpio_callback(struct device *dev, static void iis2dlpc_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; ARG_UNUSED(unused); @@ -233,7 +233,7 @@ static void iis2dlpc_work_cb(struct k_work *work) int iis2dlpc_init_interrupt(struct device *dev) { - struct iis2dlpc_data *iis2dlpc = dev->driver_data; + struct iis2dlpc_data *iis2dlpc = dev->data; const struct iis2dlpc_device_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/iis2mdc/iis2mdc.c b/drivers/sensor/iis2mdc/iis2mdc.c index 62cc8002cb4..37f62114a75 100644 --- a/drivers/sensor/iis2mdc/iis2mdc.c +++ b/drivers/sensor/iis2mdc/iis2mdc.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(IIS2MDC, CONFIG_SENSOR_LOG_LEVEL); #ifdef CONFIG_IIS2MDC_MAG_ODR_RUNTIME static int iis2mdc_set_odr(struct device *dev, const struct sensor_value *val) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; iis2mdc_odr_t odr; switch (val->val1) { @@ -56,7 +56,7 @@ static int iis2mdc_set_odr(struct device *dev, const struct sensor_value *val) static int iis2mdc_set_hard_iron(struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; uint8_t i; union axis3bit16_t offset; @@ -75,7 +75,7 @@ static void iis2mdc_channel_get_mag(struct device *dev, int32_t cval; int i; uint8_t ofs_start, ofs_stop; - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -105,7 +105,7 @@ static void iis2mdc_channel_get_mag(struct device *dev, static void iis2mdc_channel_get_temp(struct device *dev, struct sensor_value *val) { - struct iis2mdc_data *drv_data = dev->driver_data; + struct iis2mdc_data *drv_data = dev->data; val->val1 = drv_data->temp_sample / 100; val->val2 = (drv_data->temp_sample % 100) * 10000; @@ -173,7 +173,7 @@ static int iis2mdc_attr_set(struct device *dev, static int iis2mdc_sample_fetch_mag(struct device *dev) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; union axis3bit16_t raw_mag; /* fetch raw data sample */ @@ -191,7 +191,7 @@ static int iis2mdc_sample_fetch_mag(struct device *dev) static int iis2mdc_sample_fetch_temp(struct device *dev) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; union axis1bit16_t raw_temp; int32_t temp; @@ -243,7 +243,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; - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; iis2mdc->bus = device_get_binding(config->master_dev_name); if (!iis2mdc->bus) { @@ -288,7 +288,7 @@ static const struct iis2mdc_config iis2mdc_dev_config = { static int iis2mdc_init(struct device *dev) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; uint8_t wai; if (iis2mdc_init_interface(dev)) { diff --git a/drivers/sensor/iis2mdc/iis2mdc_i2c.c b/drivers/sensor/iis2mdc/iis2mdc_i2c.c index 5c4c88174b2..94922fe9f60 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_i2c.c +++ b/drivers/sensor/iis2mdc/iis2mdc_i2c.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(IIS2MDC); 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; + struct iis2mdc_data *data = dev->data; const struct iis2mdc_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -34,7 +34,7 @@ static int iis2mdc_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct iis2mdc_data *data = dev->data; const struct iis2mdc_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -43,7 +43,7 @@ static int iis2mdc_i2c_write(struct device *dev, uint8_t reg_addr, int iis2mdc_i2c_init(struct device *dev) { - struct iis2mdc_data *data = dev->driver_data; + struct iis2mdc_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) iis2mdc_i2c_read; data->ctx_i2c.write_reg = (stmdev_write_ptr) iis2mdc_i2c_write; diff --git a/drivers/sensor/iis2mdc/iis2mdc_spi.c b/drivers/sensor/iis2mdc/iis2mdc_spi.c index ac4f8909140..47822d3c345 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_spi.c +++ b/drivers/sensor/iis2mdc/iis2mdc_spi.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(IIS2MDC); 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; + struct iis2mdc_data *data = dev->data; 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 }; @@ -66,7 +66,7 @@ static int iis2mdc_spi_read(struct device *dev, uint8_t reg_addr, 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; + struct iis2mdc_data *data = dev->data; 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 }; @@ -99,7 +99,7 @@ static int iis2mdc_spi_write(struct device *dev, uint8_t reg_addr, int iis2mdc_spi_init(struct device *dev) { - struct iis2mdc_data *data = dev->driver_data; + struct iis2mdc_data *data = dev->data; data->ctx_spi.read_reg = (stmdev_read_ptr) iis2mdc_spi_read; data->ctx_spi.write_reg = (stmdev_write_ptr) iis2mdc_spi_write; diff --git a/drivers/sensor/iis2mdc/iis2mdc_trigger.c b/drivers/sensor/iis2mdc/iis2mdc_trigger.c index a4dd74e13fd..9aa9c210e6e 100644 --- a/drivers/sensor/iis2mdc/iis2mdc_trigger.c +++ b/drivers/sensor/iis2mdc/iis2mdc_trigger.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(IIS2MDC, CONFIG_SENSOR_LOG_LEVEL); static int iis2mdc_enable_int(struct device *dev, int enable) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; /* set interrupt on mag */ return iis2mdc_drdy_on_pin_set(iis2mdc->ctx, enable); @@ -31,7 +31,7 @@ int iis2mdc_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; union axis3bit16_t raw; if (trig->chan == SENSOR_CHAN_MAGN_XYZ) { @@ -53,7 +53,7 @@ int iis2mdc_trigger_set(struct device *dev, static void iis2mdc_handle_interrupt(void *arg) { struct device *dev = arg; - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; const struct iis2mdc_config *const config = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -89,7 +89,7 @@ static void iis2mdc_gpio_callback(struct device *dev, static void iis2mdc_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; ARG_UNUSED(unused); @@ -112,7 +112,7 @@ static void iis2mdc_work_cb(struct k_work *work) int iis2mdc_init_interrupt(struct device *dev) { - struct iis2mdc_data *iis2mdc = dev->driver_data; + struct iis2mdc_data *iis2mdc = dev->data; const struct iis2mdc_config *const config = dev->config; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/iis3dhhc/iis3dhhc.c b/drivers/sensor/iis3dhhc/iis3dhhc.c index 3738a2357a9..ce848e672ab 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(IIS3DHHC, CONFIG_SENSOR_LOG_LEVEL); static int iis3dhhc_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct iis3dhhc_data *data = dev->driver_data; + struct iis3dhhc_data *data = dev->data; union axis3bit16_t raw_accel; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -54,7 +54,7 @@ static inline void iis3dhhc_channel_get_acc(struct device *dev, { int i; uint8_t ofs_start, ofs_stop; - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -99,7 +99,7 @@ static int iis3dhhc_channel_get(struct device *dev, static int iis3dhhc_odr_set(struct device *dev, const struct sensor_value *val) { - struct iis3dhhc_data *data = dev->driver_data; + struct iis3dhhc_data *data = dev->data; iis3dhhc_norm_mod_en_t en; switch (val->val1) { @@ -152,7 +152,7 @@ static const struct sensor_driver_api iis3dhhc_api_funcs = { static int iis3dhhc_init_chip(struct device *dev) { - struct iis3dhhc_data *data = dev->driver_data; + struct iis3dhhc_data *data = dev->data; uint8_t chip_id, rst; if (iis3dhhc_device_id_get(data->ctx, &chip_id) < 0) { @@ -192,7 +192,7 @@ static int iis3dhhc_init_chip(struct device *dev) static int iis3dhhc_init(struct device *dev) { const struct iis3dhhc_config * const config = dev->config; - struct iis3dhhc_data *data = dev->driver_data; + struct iis3dhhc_data *data = dev->data; data->bus = device_get_binding(config->master_dev_name); if (!data->bus) { diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c index 35b9b647717..30c94738fdd 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc_spi.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc_spi.c @@ -98,7 +98,7 @@ stmdev_ctx_t iis3dhhc_spi_ctx = { int iis3dhhc_spi_init(struct device *dev) { - struct iis3dhhc_data *data = dev->driver_data; + struct iis3dhhc_data *data = dev->data; data->ctx = &iis3dhhc_spi_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c index 958b591fe81..eb87804277d 100644 --- a/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c +++ b/drivers/sensor/iis3dhhc/iis3dhhc_trigger.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(IIS3DHHC, CONFIG_SENSOR_LOG_LEVEL); */ static int iis3dhhc_enable_int(struct device *dev, int enable) { - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; /* set interrupt */ #ifdef CONFIG_IIS3DHHC_DRDY_INT1 @@ -41,7 +41,7 @@ int iis3dhhc_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; union axis3bit16_t raw; if (trig->chan == SENSOR_CHAN_ACCEL_XYZ) { @@ -65,7 +65,7 @@ int iis3dhhc_trigger_set(struct device *dev, static void iis3dhhc_handle_interrupt(void *arg) { struct device *dev = arg; - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -102,7 +102,7 @@ static void iis3dhhc_gpio_callback(struct device *dev, static void iis3dhhc_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; ARG_UNUSED(unused); @@ -125,7 +125,7 @@ static void iis3dhhc_work_cb(struct k_work *work) int iis3dhhc_init_interrupt(struct device *dev) { - struct iis3dhhc_data *iis3dhhc = dev->driver_data; + struct iis3dhhc_data *iis3dhhc = dev->data; const struct iis3dhhc_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/isl29035/isl29035.c b/drivers/sensor/isl29035/isl29035.c index 38334b223eb..173e97b4b45 100644 --- a/drivers/sensor/isl29035/isl29035.c +++ b/drivers/sensor/isl29035/isl29035.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(ISL29035, CONFIG_SENSOR_LOG_LEVEL); static int isl29035_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; uint8_t msb, lsb; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -45,7 +45,7 @@ static int isl29035_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; uint64_t tmp; #if CONFIG_ISL29035_MODE_ALS @@ -74,7 +74,7 @@ static const struct sensor_driver_api isl29035_api = { static int isl29035_init(struct device *dev) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/isl29035/isl29035_trigger.c b/drivers/sensor/isl29035/isl29035_trigger.c index 7743d4b7f99..21f4e3588f1 100644 --- a/drivers/sensor/isl29035/isl29035_trigger.c +++ b/drivers/sensor/isl29035/isl29035_trigger.c @@ -57,7 +57,7 @@ int isl29035_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; uint8_t lsb_reg, msb_reg; uint16_t raw_val; @@ -97,7 +97,7 @@ static void isl29035_gpio_callback(struct device *dev, static void isl29035_thread_cb(struct device *dev) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; uint8_t val; /* clear interrupt */ @@ -118,7 +118,7 @@ static void isl29035_thread_cb(struct device *dev) static void isl29035_thread(int ptr, int unused) { struct device *dev = INT_TO_POINTER(ptr); - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -143,7 +143,7 @@ int isl29035_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; /* disable interrupt callback while changing parameters */ setup_int(drv_data, false); @@ -163,7 +163,7 @@ int isl29035_trigger_set(struct device *dev, int isl29035_init_interrupt(struct device *dev) { - struct isl29035_driver_data *drv_data = dev->driver_data; + struct isl29035_driver_data *drv_data = dev->data; /* set interrupt persistence */ if (i2c_reg_update_byte(drv_data->i2c, ISL29035_I2C_ADDRESS, diff --git a/drivers/sensor/ism330dhcx/ism330dhcx.c b/drivers/sensor/ism330dhcx/ism330dhcx.c index 9be5a8b7617..617a6793566 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx.c @@ -90,7 +90,7 @@ static int ism330dhcx_gyro_range_to_fs_val(int32_t range) static inline int ism330dhcx_reboot(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; if (ism330dhcx_boot_set(data->ctx, 1) < 0) { return -EIO; @@ -104,7 +104,7 @@ static inline int ism330dhcx_reboot(struct device *dev) static int ism330dhcx_accel_set_fs_raw(struct device *dev, uint8_t fs) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; if (ism330dhcx_xl_full_scale_set(data->ctx, fs) < 0) { return -EIO; @@ -117,7 +117,7 @@ static int ism330dhcx_accel_set_fs_raw(struct device *dev, uint8_t fs) static int ism330dhcx_accel_set_odr_raw(struct device *dev, uint8_t odr) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; if (ism330dhcx_xl_data_rate_set(data->ctx, odr) < 0) { return -EIO; @@ -130,7 +130,7 @@ static int ism330dhcx_accel_set_odr_raw(struct device *dev, uint8_t odr) static int ism330dhcx_gyro_set_fs_raw(struct device *dev, uint8_t fs) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; if (ism330dhcx_gy_full_scale_set(data->ctx, fs) < 0) { return -EIO; @@ -141,7 +141,7 @@ static int ism330dhcx_gyro_set_fs_raw(struct device *dev, uint8_t fs) static int ism330dhcx_gyro_set_odr_raw(struct device *dev, uint8_t odr) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; if (ism330dhcx_gy_data_rate_set(data->ctx, odr) < 0) { return -EIO; @@ -173,7 +173,7 @@ static int ism330dhcx_accel_odr_set(struct device *dev, uint16_t freq) static int ism330dhcx_accel_range_set(struct device *dev, int32_t range) { int fs; - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; fs = ism330dhcx_accel_range_to_fs_val(range); if (fs < 0) { @@ -234,7 +234,7 @@ static int ism330dhcx_gyro_odr_set(struct device *dev, uint16_t freq) static int ism330dhcx_gyro_range_set(struct device *dev, int32_t range) { int fs; - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; fs = ism330dhcx_gyro_range_to_fs_val(range); if (fs < 0) { @@ -297,7 +297,7 @@ static int ism330dhcx_attr_set(struct device *dev, enum sensor_channel chan, static int ism330dhcx_sample_fetch_accel(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; union axis3bit16_t buf; if (ism330dhcx_acceleration_raw_get(data->ctx, buf.u8bit) < 0) { @@ -314,7 +314,7 @@ static int ism330dhcx_sample_fetch_accel(struct device *dev) static int ism330dhcx_sample_fetch_gyro(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; union axis3bit16_t buf; if (ism330dhcx_angular_rate_raw_get(data->ctx, buf.u8bit) < 0) { @@ -332,7 +332,7 @@ static int ism330dhcx_sample_fetch_gyro(struct device *dev) #if defined(CONFIG_ISM330DHCX_ENABLE_TEMP) static int ism330dhcx_sample_fetch_temp(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; union axis1bit16_t buf; if (ism330dhcx_temperature_raw_get(data->ctx, buf.u8bit) < 0) { @@ -629,7 +629,7 @@ static int ism330dhcx_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: @@ -687,7 +687,7 @@ static const struct sensor_driver_api ism330dhcx_api_funcs = { static int ism330dhcx_init_chip(struct device *dev) { - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; uint8_t chip_id; if (ism330dhcx_device_id_get(ism330dhcx->ctx, &chip_id) < 0) { @@ -806,7 +806,7 @@ static const struct ism330dhcx_config ism330dhcx_config = { static int ism330dhcx_init(struct device *dev) { const struct ism330dhcx_config * const config = dev->config; - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; data->bus = device_get_binding(config->bus_name); if (!data->bus) { diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c index 7f66ef6d4cf..49b2a9e3e4d 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_i2c.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); 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; + struct ism330dhcx_data *data = dev->data; const struct ism330dhcx_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -33,7 +33,7 @@ static int ism330dhcx_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct ism330dhcx_data *data = dev->data; const struct ism330dhcx_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -42,7 +42,7 @@ static int ism330dhcx_i2c_write(struct device *dev, uint8_t reg_addr, int ism330dhcx_i2c_init(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) ism330dhcx_i2c_read, data->ctx_i2c.write_reg = (stmdev_write_ptr) ism330dhcx_i2c_write, diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c index 1d3f83ea815..0feb840c6a6 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_shub.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_shub.c @@ -683,7 +683,7 @@ int ism330dhcx_shub_get_idx(enum sensor_channel type) int ism330dhcx_shub_fetch_external_devs(struct device *dev) { uint8_t n; - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; struct ism330dhcx_shub_slist *sp; /* read data from external slave */ @@ -709,7 +709,7 @@ int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; struct ism330dhcx_shub_slist *sp = NULL; uint8_t n; @@ -735,7 +735,7 @@ int ism330dhcx_shub_config(struct device *dev, enum sensor_channel chan, int ism330dhcx_shub_init(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; uint8_t i, n = 0, regn; uint8_t chip_id; struct ism330dhcx_shub_slist *sp; diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c index e40f3661a41..3ae3a299d71 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_spi.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_spi.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(ISM330DHCX, CONFIG_SENSOR_LOG_LEVEL); 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; + struct ism330dhcx_data *data = dev->data; 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 }; @@ -65,7 +65,7 @@ static int ism330dhcx_spi_read(struct device *dev, uint8_t reg_addr, 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; + struct ism330dhcx_data *data = dev->data; 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 }; @@ -98,7 +98,7 @@ static int ism330dhcx_spi_write(struct device *dev, uint8_t reg_addr, int ism330dhcx_spi_init(struct device *dev) { - struct ism330dhcx_data *data = dev->driver_data; + struct ism330dhcx_data *data = dev->data; data->ctx_spi.read_reg = (stmdev_read_ptr) ism330dhcx_spi_read, data->ctx_spi.write_reg = (stmdev_write_ptr) ism330dhcx_spi_write, diff --git a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c index bf41e91b22f..50fa9c95fc6 100644 --- a/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c +++ b/drivers/sensor/ism330dhcx/ism330dhcx_trigger.c @@ -26,7 +26,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; - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; ism330dhcx_pin_int2_route_t int2_route; if (enable) { @@ -54,7 +54,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; - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; if (enable) { union axis3bit16_t buf; @@ -90,7 +90,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; - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; if (enable) { union axis3bit16_t buf; @@ -126,7 +126,7 @@ int ism330dhcx_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; if (trig->chan == SENSOR_CHAN_ACCEL_XYZ) { ism330dhcx->handler_drdy_acc = handler; @@ -164,7 +164,7 @@ int ism330dhcx_trigger_set(struct device *dev, static void ism330dhcx_handle_interrupt(void *arg) { struct device *dev = arg; - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -227,7 +227,7 @@ static void ism330dhcx_gpio_callback(struct device *dev, static void ism330dhcx_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; ARG_UNUSED(unused); @@ -250,7 +250,7 @@ static void ism330dhcx_work_cb(struct k_work *work) int ism330dhcx_init_interrupt(struct device *dev) { - struct ism330dhcx_data *ism330dhcx = dev->driver_data; + struct ism330dhcx_data *ism330dhcx = dev->data; const struct ism330dhcx_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c index d058370631f..a0293392752 100644 --- a/drivers/sensor/lis2dh/lis2dh.c +++ b/drivers/sensor/lis2dh/lis2dh.c @@ -56,7 +56,7 @@ static int lis2dh_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int ofs_start; int ofs_end; int i; @@ -87,7 +87,7 @@ static int lis2dh_channel_get(struct device *dev, static int lis2dh_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; size_t i; int status; @@ -148,7 +148,7 @@ static int lis2dh_acc_odr_set(struct device *dev, uint16_t freq) int odr; int status; uint8_t value; - struct lis2dh_data *data = dev->driver_data; + struct lis2dh_data *data = dev->data; odr = lis2dh_freq_to_odr_val(freq); if (odr < 0) { @@ -197,7 +197,7 @@ static int lis2dh_range_to_reg_val(uint16_t range) static int lis2dh_acc_range_set(struct device *dev, int32_t range) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int fs; fs = lis2dh_range_to_reg_val(range); @@ -268,7 +268,7 @@ static const struct sensor_driver_api lis2dh_driver_api = { int lis2dh_init(struct device *dev) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; const struct lis2dh_config *cfg = dev->config; int status; uint8_t id; diff --git a/drivers/sensor/lis2dh/lis2dh_i2c.c b/drivers/sensor/lis2dh/lis2dh_i2c.c index b69e09866b0..e5991cc424d 100644 --- a/drivers/sensor/lis2dh/lis2dh_i2c.c +++ b/drivers/sensor/lis2dh/lis2dh_i2c.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lis2dh_data *data = dev->data; const struct lis2dh_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -34,7 +34,7 @@ static int lis2dh_i2c_read_data(struct device *dev, uint8_t reg_addr, 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; + struct lis2dh_data *data = dev->data; const struct lis2dh_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -45,7 +45,7 @@ static int lis2dh_i2c_write_data(struct device *dev, uint8_t reg_addr, static int lis2dh_i2c_read_reg(struct device *dev, uint8_t reg_addr, uint8_t *value) { - struct lis2dh_data *data = dev->driver_data; + struct lis2dh_data *data = dev->data; const struct lis2dh_config *cfg = dev->config; return i2c_reg_read_byte(data->bus, @@ -56,7 +56,7 @@ static int lis2dh_i2c_read_reg(struct device *dev, uint8_t reg_addr, static int lis2dh_i2c_write_reg(struct device *dev, uint8_t reg_addr, uint8_t value) { - struct lis2dh_data *data = dev->driver_data; + struct lis2dh_data *data = dev->data; const struct lis2dh_config *cfg = dev->config; return i2c_reg_write_byte(data->bus, @@ -67,7 +67,7 @@ static int lis2dh_i2c_write_reg(struct device *dev, uint8_t reg_addr, 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; + struct lis2dh_data *data = dev->data; const struct lis2dh_config *cfg = dev->config; return i2c_reg_update_byte(data->bus, @@ -85,7 +85,7 @@ static const struct lis2dh_transfer_function lis2dh_i2c_transfer_fn = { int lis2dh_i2c_init(struct device *dev) { - struct lis2dh_data *data = dev->driver_data; + struct lis2dh_data *data = dev->data; data->hw_tf = &lis2dh_i2c_transfer_fn; diff --git a/drivers/sensor/lis2dh/lis2dh_spi.c b/drivers/sensor/lis2dh/lis2dh_spi.c index 9336b645637..46cc1f94e39 100644 --- a/drivers/sensor/lis2dh/lis2dh_spi.c +++ b/drivers/sensor/lis2dh/lis2dh_spi.c @@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lis2dh_data *data = dev->data; 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 }; @@ -67,7 +67,7 @@ static int lis2dh_raw_read(struct device *dev, uint8_t reg_addr, 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; + struct lis2dh_data *data = dev->data; 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 }; @@ -149,7 +149,7 @@ static const struct lis2dh_transfer_function lis2dh_spi_transfer_fn = { int lis2dh_spi_init(struct device *dev) { - struct lis2dh_data *data = dev->driver_data; + struct lis2dh_data *data = dev->data; data->hw_tf = &lis2dh_spi_transfer_fn; diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c index 646478559b8..65b38da970e 100644 --- a/drivers/sensor/lis2dh/lis2dh_trigger.c +++ b/drivers/sensor/lis2dh/lis2dh_trigger.c @@ -21,7 +21,7 @@ LOG_MODULE_DECLARE(lis2dh, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_int1(struct device *dev, bool enable) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; gpio_pin_interrupt_configure(lis2dh->gpio_int1, LIS2DH_INT1_GPIOS_PIN, @@ -33,7 +33,7 @@ static inline void setup_int1(struct device *dev, static int lis2dh_trigger_drdy_set(struct device *dev, enum sensor_channel chan, sensor_trigger_handler_t handler) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int status; setup_int1(dev, false); @@ -69,7 +69,7 @@ static int lis2dh_start_trigger_int1(struct device *dev) int status; uint8_t raw[LIS2DH_BUF_SZ]; uint8_t ctrl1 = 0U; - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; /* power down temporarily to align interrupt & data output sampling */ status = lis2dh->hw_tf->read_reg(dev, LIS2DH_REG_CTRL1, &ctrl1); @@ -112,7 +112,7 @@ static int lis2dh_start_trigger_int1(struct device *dev) static inline void setup_int2(struct device *dev, bool enable) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; gpio_pin_interrupt_configure(lis2dh->gpio_int2, LIS2DH_INT2_GPIOS_PIN, @@ -124,7 +124,7 @@ static inline void setup_int2(struct device *dev, static int lis2dh_trigger_anym_set(struct device *dev, sensor_trigger_handler_t handler) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int status; uint8_t reg_val; @@ -158,7 +158,7 @@ static int lis2dh_trigger_anym_set(struct device *dev, static int lis2dh_start_trigger_int2(struct device *dev) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; setup_int2(dev, true); @@ -186,7 +186,7 @@ int lis2dh_trigger_set(struct device *dev, int lis2dh_acc_slope_config(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int status; if (attr == SENSOR_ATTR_SLOPE_TH) { @@ -275,7 +275,7 @@ static void lis2dh_gpio_int2_callback(struct device *dev, static void lis2dh_thread_cb(void *arg) { struct device *dev = arg; - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int status; if (unlikely(atomic_test_and_clear_bit(&lis2dh->trig_flags, @@ -347,7 +347,7 @@ static void lis2dh_thread_cb(void *arg) static void lis2dh_thread(void *arg1, void *unused2, void *unused3) { struct device *dev = arg1; - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; ARG_UNUSED(unused2); ARG_UNUSED(unused3); @@ -371,7 +371,7 @@ static void lis2dh_work_cb(struct k_work *work) int lis2dh_init_interrupt(struct device *dev) { - struct lis2dh_data *lis2dh = dev->driver_data; + struct lis2dh_data *lis2dh = dev->data; int status; #if DT_INST_PROP_HAS_IDX(0, irq_gpios, 1) uint8_t raw[2]; diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c index 2d4b657681e..fb5b86a091e 100644 --- a/drivers/sensor/lis2ds12/lis2ds12.c +++ b/drivers/sensor/lis2ds12/lis2ds12.c @@ -59,7 +59,7 @@ static int lis2ds12_freq_to_odr_val(uint16_t freq) static int lis2ds12_accel_odr_set(struct device *dev, uint16_t freq) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; int odr; odr = lis2ds12_freq_to_odr_val(freq); @@ -99,7 +99,7 @@ static int lis2ds12_accel_range_to_fs_val(int32_t range) static int lis2ds12_accel_range_set(struct device *dev, int32_t range) { int fs; - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; fs = lis2ds12_accel_range_to_fs_val(range); if (fs < 0) { @@ -157,7 +157,7 @@ static int lis2ds12_attr_set(struct device *dev, enum sensor_channel chan, static int lis2ds12_sample_fetch_accel(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; uint8_t buf[6]; if (data->hw_tf->read_data(data, LIS2DS12_REG_OUTX_L, @@ -240,7 +240,7 @@ static int lis2ds12_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; return lis2ds12_get_channel(chan, val, data, data->gain); } @@ -257,7 +257,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; - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; uint8_t chip_id; data->comm_master = device_get_binding(config->comm_master_dev_name); diff --git a/drivers/sensor/lis2ds12/lis2ds12_i2c.c b/drivers/sensor/lis2ds12/lis2ds12_i2c.c index c295d7e80f1..c20f20d526f 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_i2c.c +++ b/drivers/sensor/lis2ds12/lis2ds12_i2c.c @@ -67,7 +67,7 @@ static const struct lis2ds12_transfer_function lis2ds12_i2c_transfer_fn = { int lis2ds12_i2c_init(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; data->hw_tf = &lis2ds12_i2c_transfer_fn; diff --git a/drivers/sensor/lis2ds12/lis2ds12_spi.c b/drivers/sensor/lis2ds12/lis2ds12_spi.c index a420a8ed7de..5bdfa7d9c2d 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_spi.c +++ b/drivers/sensor/lis2ds12/lis2ds12_spi.c @@ -153,7 +153,7 @@ static const struct lis2ds12_transfer_function lis2ds12_spi_transfer_fn = { int lis2ds12_spi_init(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; data->hw_tf = &lis2ds12_spi_transfer_fn; diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c index 523dc3c4392..50a5e82aa59 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c +++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c @@ -40,7 +40,7 @@ static void lis2ds12_gpio_callback(struct device *dev, static void lis2ds12_handle_drdy_int(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; if (data->data_ready_handler != NULL) { data->data_ready_handler(dev, &data->data_ready_trigger); @@ -50,7 +50,7 @@ static void lis2ds12_handle_drdy_int(struct device *dev) static void lis2ds12_handle_int(void *arg) { struct device *dev = arg; - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; const struct lis2ds12_config *cfg = dev->config; uint8_t status; @@ -71,7 +71,7 @@ static void lis2ds12_handle_int(void *arg) static void lis2ds12_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; ARG_UNUSED(unused); @@ -94,7 +94,7 @@ static void lis2ds12_work_cb(struct k_work *work) static int lis2ds12_init_interrupt(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; /* Enable latched mode */ if (data->hw_tf->update_reg(data, @@ -119,7 +119,7 @@ static int lis2ds12_init_interrupt(struct device *dev) int lis2ds12_trigger_init(struct device *dev) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; const struct lis2ds12_config *cfg = dev->config; /* setup data ready gpio interrupt */ @@ -164,7 +164,7 @@ int lis2ds12_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lis2ds12_data *data = dev->driver_data; + struct lis2ds12_data *data = dev->data; const struct lis2ds12_config *cfg = dev->config; uint8_t buf[6]; diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c index f67b44b05cc..279581ea062 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.c +++ b/drivers/sensor/lis2dw12/lis2dw12.c @@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(LIS2DW12, CONFIG_SENSOR_LOG_LEVEL); static int lis2dw12_set_range(struct device *dev, uint16_t range) { int err; - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; uint8_t shift_gain = 0U; uint8_t fs = LIS2DW12_FS_TO_REG(range); @@ -62,7 +62,7 @@ static int lis2dw12_set_range(struct device *dev, uint16_t range) */ static int lis2dw12_set_odr(struct device *dev, uint16_t odr) { - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; uint8_t val; /* check if power off */ @@ -98,7 +98,7 @@ static inline void lis2dw12_channel_get_acc(struct device *dev, { int i; uint8_t ofs_start, ofs_stop; - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -177,7 +177,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; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; uint8_t shift; union axis3bit16_t buf; @@ -213,7 +213,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; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; lis2dw12->bus = device_get_binding(cfg->bus_name); @@ -255,7 +255,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; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; uint8_t wai; diff --git a/drivers/sensor/lis2dw12/lis2dw12_i2c.c b/drivers/sensor/lis2dw12/lis2dw12_i2c.c index 568f1b4b902..deb51f15064 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_i2c.c +++ b/drivers/sensor/lis2dw12/lis2dw12_i2c.c @@ -43,7 +43,7 @@ stmdev_ctx_t lis2dw12_i2c_ctx = { int lis2dw12_i2c_init(struct device *dev) { - struct lis2dw12_data *data = dev->driver_data; + struct lis2dw12_data *data = dev->data; data->ctx = &lis2dw12_i2c_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/lis2dw12/lis2dw12_spi.c b/drivers/sensor/lis2dw12/lis2dw12_spi.c index 897cb73f9fa..13f9681f0ac 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_spi.c +++ b/drivers/sensor/lis2dw12/lis2dw12_spi.c @@ -99,7 +99,7 @@ stmdev_ctx_t lis2dw12_spi_ctx = { int lis2dw12_spi_init(struct device *dev) { - struct lis2dw12_data *data = dev->driver_data; + struct lis2dw12_data *data = dev->data; data->ctx = &lis2dw12_spi_ctx; data->ctx->handle = data; diff --git a/drivers/sensor/lis2dw12/lis2dw12_trigger.c b/drivers/sensor/lis2dw12/lis2dw12_trigger.c index 5242d9139f1..e8523862b7b 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_trigger.c +++ b/drivers/sensor/lis2dw12/lis2dw12_trigger.c @@ -26,7 +26,7 @@ static int lis2dw12_enable_int(struct device *dev, enum sensor_trigger_type type, int enable) { const struct lis2dw12_device_config *cfg = dev->config; - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; lis2dw12_reg_t int_route; if (cfg->int_pin == 1U) { @@ -79,7 +79,7 @@ int lis2dw12_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; union axis3bit16_t raw; int state = (handler != NULL) ? PROPERTY_ENABLE : PROPERTY_DISABLE; @@ -110,7 +110,7 @@ int lis2dw12_trigger_set(struct device *dev, static int lis2dw12_handle_drdy_int(struct device *dev) { - struct lis2dw12_data *data = dev->driver_data; + struct lis2dw12_data *data = dev->data; struct sensor_trigger drdy_trig = { .type = SENSOR_TRIG_DATA_READY, @@ -127,7 +127,7 @@ static int lis2dw12_handle_drdy_int(struct device *dev) #ifdef CONFIG_LIS2DW12_PULSE static int lis2dw12_handle_single_tap_int(struct device *dev) { - struct lis2dw12_data *data = dev->driver_data; + struct lis2dw12_data *data = dev->data; sensor_trigger_handler_t handler = data->tap_handler; struct sensor_trigger pulse_trig = { @@ -144,7 +144,7 @@ static int lis2dw12_handle_single_tap_int(struct device *dev) static int lis2dw12_handle_double_tap_int(struct device *dev) { - struct lis2dw12_data *data = dev->driver_data; + struct lis2dw12_data *data = dev->data; sensor_trigger_handler_t handler = data->double_tap_handler; struct sensor_trigger pulse_trig = { @@ -167,7 +167,7 @@ static int lis2dw12_handle_double_tap_int(struct device *dev) static void lis2dw12_handle_interrupt(void *arg) { struct device *dev = (struct device *)arg; - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; lis2dw12_all_sources_t sources; @@ -213,7 +213,7 @@ static void lis2dw12_gpio_callback(struct device *dev, static void lis2dw12_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; ARG_UNUSED(unused); @@ -236,7 +236,7 @@ static void lis2dw12_work_cb(struct k_work *work) int lis2dw12_init_interrupt(struct device *dev) { - struct lis2dw12_data *lis2dw12 = dev->driver_data; + struct lis2dw12_data *lis2dw12 = dev->data; const struct lis2dw12_device_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 3edfc3fcfba..fd2488fa403 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(LIS2MDL, CONFIG_SENSOR_LOG_LEVEL); #ifdef CONFIG_LIS2MDL_MAG_ODR_RUNTIME static int lis2mdl_set_odr(struct device *dev, const struct sensor_value *val) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; lis2mdl_odr_t odr; switch (val->val1) { @@ -56,7 +56,7 @@ static int lis2mdl_set_odr(struct device *dev, const struct sensor_value *val) static int lis2mdl_set_hard_iron(struct device *dev, enum sensor_channel chan, const struct sensor_value *val) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; uint8_t i; union axis3bit16_t offset; @@ -75,7 +75,7 @@ static void lis2mdl_channel_get_mag(struct device *dev, int32_t cval; int i; uint8_t ofs_start, ofs_stop; - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; struct sensor_value *pval = val; switch (chan) { @@ -105,7 +105,7 @@ static void lis2mdl_channel_get_mag(struct device *dev, static void lis2mdl_channel_get_temp(struct device *dev, struct sensor_value *val) { - struct lis2mdl_data *drv_data = dev->driver_data; + struct lis2mdl_data *drv_data = dev->data; val->val1 = drv_data->temp_sample / 100; val->val2 = (drv_data->temp_sample % 100) * 10000; @@ -173,7 +173,7 @@ static int lis2mdl_attr_set(struct device *dev, static int lis2mdl_sample_fetch_mag(struct device *dev) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; union axis3bit16_t raw_mag; /* fetch raw data sample */ @@ -191,7 +191,7 @@ static int lis2mdl_sample_fetch_mag(struct device *dev) static int lis2mdl_sample_fetch_temp(struct device *dev) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; union axis1bit16_t raw_temp; int32_t temp; @@ -243,7 +243,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; - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; lis2mdl->bus = device_get_binding(config->master_dev_name); if (!lis2mdl->bus) { @@ -288,7 +288,7 @@ static const struct lis2mdl_config lis2mdl_dev_config = { static int lis2mdl_init(struct device *dev) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; uint8_t wai; if (lis2mdl_init_interface(dev)) { diff --git a/drivers/sensor/lis2mdl/lis2mdl_i2c.c b/drivers/sensor/lis2mdl/lis2mdl_i2c.c index 759ad3d26e5..84ce6c0b6bb 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_i2c.c +++ b/drivers/sensor/lis2mdl/lis2mdl_i2c.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(LIS2MDL); 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; + struct lis2mdl_data *data = dev->data; const struct lis2mdl_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -34,7 +34,7 @@ static int lis2mdl_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct lis2mdl_data *data = dev->data; const struct lis2mdl_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -43,7 +43,7 @@ static int lis2mdl_i2c_write(struct device *dev, uint8_t reg_addr, int lis2mdl_i2c_init(struct device *dev) { - struct lis2mdl_data *data = dev->driver_data; + struct lis2mdl_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) lis2mdl_i2c_read; data->ctx_i2c.write_reg = (stmdev_write_ptr) lis2mdl_i2c_write; diff --git a/drivers/sensor/lis2mdl/lis2mdl_spi.c b/drivers/sensor/lis2mdl/lis2mdl_spi.c index d3afdb49e48..69f72835bb6 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_spi.c +++ b/drivers/sensor/lis2mdl/lis2mdl_spi.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(LIS2MDL); 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; + struct lis2mdl_data *data = dev->data; 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 }; @@ -66,7 +66,7 @@ static int lis2mdl_spi_read(struct device *dev, uint8_t reg_addr, 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; + struct lis2mdl_data *data = dev->data; 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 }; @@ -99,7 +99,7 @@ static int lis2mdl_spi_write(struct device *dev, uint8_t reg_addr, int lis2mdl_spi_init(struct device *dev) { - struct lis2mdl_data *data = dev->driver_data; + struct lis2mdl_data *data = dev->data; data->ctx_spi.read_reg = (stmdev_read_ptr) lis2mdl_spi_read; data->ctx_spi.write_reg = (stmdev_write_ptr) lis2mdl_spi_write; diff --git a/drivers/sensor/lis2mdl/lis2mdl_trigger.c b/drivers/sensor/lis2mdl/lis2mdl_trigger.c index cde16f16e6c..07515154c10 100644 --- a/drivers/sensor/lis2mdl/lis2mdl_trigger.c +++ b/drivers/sensor/lis2mdl/lis2mdl_trigger.c @@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(LIS2MDL, CONFIG_SENSOR_LOG_LEVEL); static int lis2mdl_enable_int(struct device *dev, int enable) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; /* set interrupt on mag */ return lis2mdl_drdy_on_pin_set(lis2mdl->ctx, enable); @@ -31,7 +31,7 @@ int lis2mdl_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; union axis3bit16_t raw; if (trig->chan == SENSOR_CHAN_MAGN_XYZ) { @@ -53,7 +53,7 @@ int lis2mdl_trigger_set(struct device *dev, static void lis2mdl_handle_interrupt(void *arg) { struct device *dev = arg; - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; const struct lis2mdl_config *const config = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -89,7 +89,7 @@ static void lis2mdl_gpio_callback(struct device *dev, static void lis2mdl_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; ARG_UNUSED(unused); @@ -112,7 +112,7 @@ static void lis2mdl_work_cb(struct k_work *work) int lis2mdl_init_interrupt(struct device *dev) { - struct lis2mdl_data *lis2mdl = dev->driver_data; + struct lis2mdl_data *lis2mdl = dev->data; const struct lis2mdl_config *const config = dev->config; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c index 7c762269762..6412160e69a 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.c +++ b/drivers/sensor/lis3mdl/lis3mdl.c @@ -30,7 +30,7 @@ static int lis3mdl_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; if (chan == SENSOR_CHAN_MAGN_XYZ) { /* magn_val = sample / mang_gain */ @@ -60,7 +60,7 @@ static int lis3mdl_channel_get(struct device *dev, int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; int16_t buf[4]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -102,7 +102,7 @@ static const struct sensor_driver_api lis3mdl_driver_api = { int lis3mdl_init(struct device *dev) { - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; uint8_t chip_cfg[6]; uint8_t id, idx; diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c index d872f55cbed..c48128d7a68 100644 --- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c +++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c @@ -21,7 +21,7 @@ int lis3mdl_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; int16_t buf[3]; int ret; @@ -74,7 +74,7 @@ static void lis3mdl_gpio_callback(struct device *dev, static void lis3mdl_thread_cb(void *arg) { struct device *dev = arg; - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; if (drv_data->data_ready_handler != NULL) { drv_data->data_ready_handler(dev, @@ -90,7 +90,7 @@ static void lis3mdl_thread_cb(void *arg) static void lis3mdl_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -113,7 +113,7 @@ static void lis3mdl_work_cb(struct k_work *work) int lis3mdl_init_interrupt(struct device *dev) { - struct lis3mdl_data *drv_data = dev->driver_data; + struct lis3mdl_data *drv_data = dev->data; /* setup data ready gpio interrupt */ drv_data->gpio = diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c index e383894843f..171d50a77f3 100644 --- a/drivers/sensor/lps22hb/lps22hb.c +++ b/drivers/sensor/lps22hb/lps22hb.c @@ -22,7 +22,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; + struct lps22hb_data *data = dev->data; const struct lps22hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -34,7 +34,7 @@ static inline int lps22hb_set_odr_raw(struct device *dev, uint8_t odr) static int lps22hb_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lps22hb_data *data = dev->driver_data; + struct lps22hb_data *data = dev->data; const struct lps22hb_config *config = dev->config; uint8_t out[5]; @@ -77,7 +77,7 @@ static int lps22hb_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lps22hb_data *data = dev->driver_data; + struct lps22hb_data *data = dev->data; if (chan == SENSOR_CHAN_PRESS) { lps22hb_press_convert(val, data->sample_press); @@ -97,7 +97,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; + struct lps22hb_data *data = dev->data; const struct lps22hb_config *config = dev->config; uint8_t chip_id; @@ -134,7 +134,7 @@ err_poweroff: static int lps22hb_init(struct device *dev) { const struct lps22hb_config * const config = dev->config; - struct lps22hb_data *data = dev->driver_data; + struct lps22hb_data *data = dev->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 ebf713531ec..f1e9cba9c41 100644 --- a/drivers/sensor/lps22hh/lps22hh.c +++ b/drivers/sensor/lps22hh/lps22hh.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); static inline int lps22hh_set_odr_raw(struct device *dev, uint8_t odr) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; return lps22hh_data_rate_set(data->ctx, odr); } @@ -32,7 +32,7 @@ static inline int lps22hh_set_odr_raw(struct device *dev, uint8_t odr) static int lps22hh_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; union axis1bit32_t raw_press; union axis1bit16_t raw_temp; @@ -75,7 +75,7 @@ static int lps22hh_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; if (chan == SENSOR_CHAN_PRESS) { lps22hh_press_convert(val, data->sample_press); @@ -144,7 +144,7 @@ static const struct sensor_driver_api lps22hh_api_funcs = { static int lps22hh_init_chip(struct device *dev) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; uint8_t chip_id; if (lps22hh_device_id_get(data->ctx, &chip_id) < 0) { @@ -173,7 +173,7 @@ static int lps22hh_init_chip(struct device *dev) static int lps22hh_init(struct device *dev) { const struct lps22hh_config * const config = dev->config; - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; data->bus = device_get_binding(config->master_dev_name); if (!data->bus) { diff --git a/drivers/sensor/lps22hh/lps22hh_i2c.c b/drivers/sensor/lps22hh/lps22hh_i2c.c index 9126787bb70..3744dc5c602 100644 --- a/drivers/sensor/lps22hh/lps22hh_i2c.c +++ b/drivers/sensor/lps22hh/lps22hh_i2c.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lps22hh_data *data = dev->data; const struct lps22hh_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -33,7 +33,7 @@ static int lps22hh_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct lps22hh_data *data = dev->data; const struct lps22hh_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -42,7 +42,7 @@ static int lps22hh_i2c_write(struct device *dev, uint8_t reg_addr, int lps22hh_i2c_init(struct device *dev) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) lps22hh_i2c_read; data->ctx_i2c.write_reg = (stmdev_write_ptr) lps22hh_i2c_write; diff --git a/drivers/sensor/lps22hh/lps22hh_spi.c b/drivers/sensor/lps22hh/lps22hh_spi.c index 25e7a706709..9dcd0532205 100644 --- a/drivers/sensor/lps22hh/lps22hh_spi.c +++ b/drivers/sensor/lps22hh/lps22hh_spi.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lps22hh_data *data = dev->data; 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 }; @@ -66,7 +66,7 @@ static int lps22hh_spi_read(struct device *dev, uint8_t reg_addr, 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; + struct lps22hh_data *data = dev->data; 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 }; @@ -99,7 +99,7 @@ static int lps22hh_spi_write(struct device *dev, uint8_t reg_addr, int lps22hh_spi_init(struct device *dev) { - struct lps22hh_data *data = dev->driver_data; + struct lps22hh_data *data = dev->data; data->ctx_spi.read_reg = (stmdev_read_ptr) lps22hh_spi_read; data->ctx_spi.write_reg = (stmdev_write_ptr) lps22hh_spi_write; diff --git a/drivers/sensor/lps22hh/lps22hh_trigger.c b/drivers/sensor/lps22hh/lps22hh_trigger.c index 417a420b4cb..06625f43523 100644 --- a/drivers/sensor/lps22hh/lps22hh_trigger.c +++ b/drivers/sensor/lps22hh/lps22hh_trigger.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(LPS22HH, CONFIG_SENSOR_LOG_LEVEL); */ static int lps22hh_enable_int(struct device *dev, int enable) { - struct lps22hh_data *lps22hh = dev->driver_data; + struct lps22hh_data *lps22hh = dev->data; lps22hh_reg_t int_route; /* set interrupt */ @@ -42,7 +42,7 @@ int lps22hh_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lps22hh_data *lps22hh = dev->driver_data; + struct lps22hh_data *lps22hh = dev->data; union axis1bit32_t raw_press; if (trig->chan == SENSOR_CHAN_ALL) { @@ -70,7 +70,7 @@ int lps22hh_trigger_set(struct device *dev, static void lps22hh_handle_interrupt(void *arg) { struct device *dev = arg; - struct lps22hh_data *lps22hh = dev->driver_data; + struct lps22hh_data *lps22hh = dev->data; const struct lps22hh_config *cfg = dev->config; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, @@ -107,7 +107,7 @@ static void lps22hh_gpio_callback(struct device *dev, static void lps22hh_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lps22hh_data *lps22hh = dev->driver_data; + struct lps22hh_data *lps22hh = dev->data; ARG_UNUSED(unused); @@ -130,7 +130,7 @@ static void lps22hh_work_cb(struct k_work *work) int lps22hh_init_interrupt(struct device *dev) { - struct lps22hh_data *lps22hh = dev->driver_data; + struct lps22hh_data *lps22hh = dev->data; const struct lps22hh_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index 27b27a2ee83..c8fed57ed77 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -22,7 +22,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; + struct lps25hb_data *data = dev->data; const struct lps25hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -33,7 +33,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; + struct lps25hb_data *data = dev->data; const struct lps25hb_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -45,7 +45,7 @@ static inline int lps25hb_set_odr_raw(struct device *dev, uint8_t odr) static int lps25hb_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lps25hb_data *data = dev->driver_data; + struct lps25hb_data *data = dev->data; const struct lps25hb_config *config = dev->config; uint8_t out[5]; int offset; @@ -93,7 +93,7 @@ static int lps25hb_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lps25hb_data *data = dev->driver_data; + struct lps25hb_data *data = dev->data; if (chan == SENSOR_CHAN_PRESS) { lps25hb_press_convert(val, data->sample_press); @@ -113,7 +113,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; + struct lps25hb_data *data = dev->data; const struct lps25hb_config *config = dev->config; uint8_t chip_id; @@ -163,7 +163,7 @@ err_poweroff: static int lps25hb_init(struct device *dev) { const struct lps25hb_config * const config = dev->config; - struct lps25hb_data *data = dev->driver_data; + struct lps25hb_data *data = dev->data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c index 6364a1cf4a9..9dc1605571e 100644 --- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c +++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c @@ -19,7 +19,7 @@ static int lsm303dlhc_sample_fetch(struct device *dev, enum sensor_channel chan) { const struct lsm303dlhc_magn_config *config = dev->config; - struct lsm303dlhc_magn_data *drv_data = dev->driver_data; + struct lsm303dlhc_magn_data *drv_data = dev->data; uint8_t magn_buf[6]; uint8_t status; @@ -63,7 +63,7 @@ static int lsm303dlhc_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm303dlhc_magn_data *drv_data = dev->driver_data; + struct lsm303dlhc_magn_data *drv_data = dev->data; switch (chan) { case SENSOR_CHAN_MAGN_X: @@ -94,7 +94,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; - struct lsm303dlhc_magn_data *drv_data = dev->driver_data; + struct lsm303dlhc_magn_data *drv_data = dev->data; drv_data->i2c = device_get_binding(config->i2c_name); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index a0b463273c9..d0c2fcc5fbf 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(LSM6DS0, CONFIG_SENSOR_LOG_LEVEL); static inline int lsm6ds0_reboot(struct device *dev) { - struct lsm6ds0_data *data = dev->driver_data; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -42,7 +42,7 @@ static inline int lsm6ds0_reboot(struct device *dev) 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; + struct lsm6ds0_data *data = dev->data; 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) | @@ -58,7 +58,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -73,7 +73,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -89,7 +89,7 @@ static int lsm6ds0_accel_set_odr_raw(struct device *dev, uint8_t odr) 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; + struct lsm6ds0_data *data = dev->data; 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) | @@ -105,7 +105,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -120,7 +120,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -135,7 +135,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; uint8_t buf[6]; @@ -163,7 +163,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; uint8_t buf[6]; @@ -192,7 +192,7 @@ static int lsm6ds0_sample_fetch_gyro(struct device *dev) #if defined(CONFIG_LSM6DS0_ENABLE_TEMP) static int lsm6ds0_sample_fetch_temp(struct device *dev) { - struct lsm6ds0_data *data = dev->driver_data; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; uint8_t buf[2]; @@ -372,7 +372,7 @@ static int lsm6ds0_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm6ds0_data *data = dev->driver_data; + struct lsm6ds0_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: @@ -406,7 +406,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; + struct lsm6ds0_data *data = dev->data; const struct lsm6ds0_config *config = dev->config; uint8_t chip_id; @@ -483,7 +483,7 @@ static int lsm6ds0_init_chip(struct device *dev) static int lsm6ds0_init(struct device *dev) { const struct lsm6ds0_config * const config = dev->config; - struct lsm6ds0_data *data = dev->driver_data; + struct lsm6ds0_data *data = dev->data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index fc3c01318a8..b08134cfde7 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -90,7 +90,7 @@ static int lsm6dsl_gyro_range_to_fs_val(int32_t range) static inline int lsm6dsl_reboot(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; if (data->hw_tf->update_reg(data, LSM6DSL_REG_CTRL3_C, LSM6DSL_MASK_CTRL3_C_BOOT, @@ -106,7 +106,7 @@ static inline int lsm6dsl_reboot(struct device *dev) static int lsm6dsl_accel_set_fs_raw(struct device *dev, uint8_t fs) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; if (data->hw_tf->update_reg(data, LSM6DSL_REG_CTRL1_XL, @@ -122,7 +122,7 @@ static int lsm6dsl_accel_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6dsl_accel_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; if (data->hw_tf->update_reg(data, LSM6DSL_REG_CTRL1_XL, @@ -138,7 +138,7 @@ static int lsm6dsl_accel_set_odr_raw(struct device *dev, uint8_t odr) static int lsm6dsl_gyro_set_fs_raw(struct device *dev, uint8_t fs) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; if (fs == GYRO_FULLSCALE_125) { if (data->hw_tf->update_reg(data, @@ -161,7 +161,7 @@ static int lsm6dsl_gyro_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6dsl_gyro_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; if (data->hw_tf->update_reg(data, LSM6DSL_REG_CTRL2_G, @@ -196,7 +196,7 @@ static int lsm6dsl_accel_odr_set(struct device *dev, uint16_t freq) static int lsm6dsl_accel_range_set(struct device *dev, int32_t range) { int fs; - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; fs = lsm6dsl_accel_range_to_fs_val(range); if (fs < 0) { @@ -258,7 +258,7 @@ static int lsm6dsl_gyro_odr_set(struct device *dev, uint16_t freq) static int lsm6dsl_gyro_range_set(struct device *dev, int32_t range) { int fs; - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; fs = lsm6dsl_gyro_range_to_fs_val(range); if (fs < 0) { @@ -316,7 +316,7 @@ static int lsm6dsl_attr_set(struct device *dev, enum sensor_channel chan, static int lsm6dsl_sample_fetch_accel(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t buf[6]; if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_XL, @@ -337,7 +337,7 @@ static int lsm6dsl_sample_fetch_accel(struct device *dev) static int lsm6dsl_sample_fetch_gyro(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t buf[6]; if (data->hw_tf->read_data(data, LSM6DSL_REG_OUTX_L_G, @@ -359,7 +359,7 @@ static int lsm6dsl_sample_fetch_gyro(struct device *dev) #if defined(CONFIG_LSM6DSL_ENABLE_TEMP) static int lsm6dsl_sample_fetch_temp(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t buf[2]; if (data->hw_tf->read_data(data, LSM6DSL_REG_OUT_TEMP_L, @@ -378,7 +378,7 @@ static int lsm6dsl_sample_fetch_temp(struct device *dev) #if defined(CONFIG_LSM6DSL_EXT0_LIS2MDL) static int lsm6dsl_sample_fetch_magn(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t buf[6]; if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) { @@ -399,7 +399,7 @@ static int lsm6dsl_sample_fetch_magn(struct device *dev) #if defined(CONFIG_LSM6DSL_EXT0_LPS22HB) static int lsm6dsl_sample_fetch_press(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t buf[5]; if (lsm6dsl_shub_read_external_chip(dev, buf, sizeof(buf)) < 0) { @@ -651,7 +651,7 @@ static int lsm6dsl_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: @@ -706,7 +706,7 @@ static const struct sensor_driver_api lsm6dsl_api_funcs = { static int lsm6dsl_init_chip(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t chip_id; if (lsm6dsl_reboot(dev) < 0) { @@ -780,7 +780,7 @@ static struct lsm6dsl_config lsm6dsl_config = { static int lsm6dsl_init(struct device *dev) { const struct lsm6dsl_config * const config = dev->config; - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; data->comm_master = device_get_binding(config->comm_master_dev_name); if (!data->comm_master) { diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c index e32f81a459f..ba306563177 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c @@ -58,7 +58,7 @@ static const struct lsm6dsl_transfer_function lsm6dsl_i2c_transfer_fn = { int lsm6dsl_i2c_init(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; data->hw_tf = &lsm6dsl_i2c_transfer_fn; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c index 977beda11e4..5bc07572d9c 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_shub.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_shub.c @@ -363,7 +363,7 @@ static int lsm6dsl_shub_set_data_channel(struct lsm6dsl_data *data) int lsm6dsl_shub_read_external_chip(struct device *dev, uint8_t *buf, uint8_t len) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; data->hw_tf->read_data(data, LSM6DSL_REG_SENSORHUB1, buf, len); @@ -372,7 +372,7 @@ int lsm6dsl_shub_read_external_chip(struct device *dev, uint8_t *buf, uint8_t le int lsm6dsl_shub_init_external_chip(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; uint8_t i; uint8_t chip_id = 0U; uint8_t slv_i2c_addr; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c index 47cca21a86b..a0969dcb8c4 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c @@ -144,7 +144,7 @@ static const struct lsm6dsl_transfer_function lsm6dsl_spi_transfer_fn = { int lsm6dsl_spi_init(struct device *dev) { - struct lsm6dsl_data *data = dev->driver_data; + struct lsm6dsl_data *data = dev->data; data->hw_tf = &lsm6dsl_spi_transfer_fn; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c index 3f1f1904792..a0227efd682 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c @@ -44,7 +44,7 @@ int lsm6dsl_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lsm6dsl_data *drv_data = dev->driver_data; + struct lsm6dsl_data *drv_data = dev->data; __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); @@ -79,7 +79,7 @@ static void lsm6dsl_gpio_callback(struct device *dev, static void lsm6dsl_thread_cb(void *arg) { struct device *dev = arg; - struct lsm6dsl_data *drv_data = dev->driver_data; + struct lsm6dsl_data *drv_data = dev->data; if (drv_data->data_ready_handler != NULL) { drv_data->data_ready_handler(dev, @@ -93,7 +93,7 @@ static void lsm6dsl_thread_cb(void *arg) static void lsm6dsl_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lsm6dsl_data *drv_data = dev->driver_data; + struct lsm6dsl_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -116,7 +116,7 @@ static void lsm6dsl_work_cb(struct k_work *work) int lsm6dsl_init_interrupt(struct device *dev) { - struct lsm6dsl_data *drv_data = dev->driver_data; + struct lsm6dsl_data *drv_data = dev->data; /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding(DT_INST_GPIO_LABEL(0, irq_gpios)); diff --git a/drivers/sensor/lsm6dso/lsm6dso.c b/drivers/sensor/lsm6dso/lsm6dso.c index cf8df1d0e9c..de53ffe6f4a 100644 --- a/drivers/sensor/lsm6dso/lsm6dso.c +++ b/drivers/sensor/lsm6dso/lsm6dso.c @@ -90,7 +90,7 @@ static int lsm6dso_gyro_range_to_fs_val(int32_t range) static inline int lsm6dso_reboot(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; if (lsm6dso_boot_set(data->ctx, 1) < 0) { return -EIO; @@ -104,7 +104,7 @@ static inline int lsm6dso_reboot(struct device *dev) static int lsm6dso_accel_set_fs_raw(struct device *dev, uint8_t fs) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; if (lsm6dso_xl_full_scale_set(data->ctx, fs) < 0) { return -EIO; @@ -117,7 +117,7 @@ static int lsm6dso_accel_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6dso_accel_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; if (lsm6dso_xl_data_rate_set(data->ctx, odr) < 0) { return -EIO; @@ -130,7 +130,7 @@ static int lsm6dso_accel_set_odr_raw(struct device *dev, uint8_t odr) static int lsm6dso_gyro_set_fs_raw(struct device *dev, uint8_t fs) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; if (lsm6dso_gy_full_scale_set(data->ctx, fs) < 0) { return -EIO; @@ -141,7 +141,7 @@ static int lsm6dso_gyro_set_fs_raw(struct device *dev, uint8_t fs) static int lsm6dso_gyro_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; if (lsm6dso_gy_data_rate_set(data->ctx, odr) < 0) { return -EIO; @@ -173,7 +173,7 @@ static int lsm6dso_accel_odr_set(struct device *dev, uint16_t freq) static int lsm6dso_accel_range_set(struct device *dev, int32_t range) { int fs; - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; fs = lsm6dso_accel_range_to_fs_val(range); if (fs < 0) { @@ -234,7 +234,7 @@ static int lsm6dso_gyro_odr_set(struct device *dev, uint16_t freq) static int lsm6dso_gyro_range_set(struct device *dev, int32_t range) { int fs; - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; fs = lsm6dso_gyro_range_to_fs_val(range); if (fs < 0) { @@ -297,7 +297,7 @@ static int lsm6dso_attr_set(struct device *dev, enum sensor_channel chan, static int lsm6dso_sample_fetch_accel(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; union axis3bit16_t buf; if (lsm6dso_acceleration_raw_get(data->ctx, buf.u8bit) < 0) { @@ -314,7 +314,7 @@ static int lsm6dso_sample_fetch_accel(struct device *dev) static int lsm6dso_sample_fetch_gyro(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; union axis3bit16_t buf; if (lsm6dso_angular_rate_raw_get(data->ctx, buf.u8bit) < 0) { @@ -332,7 +332,7 @@ static int lsm6dso_sample_fetch_gyro(struct device *dev) #if defined(CONFIG_LSM6DSO_ENABLE_TEMP) static int lsm6dso_sample_fetch_temp(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; union axis1bit16_t buf; if (lsm6dso_temperature_raw_get(data->ctx, buf.u8bit) < 0) { @@ -629,7 +629,7 @@ static int lsm6dso_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_X: @@ -687,7 +687,7 @@ static const struct sensor_driver_api lsm6dso_api_funcs = { static int lsm6dso_init_chip(struct device *dev) { - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; uint8_t chip_id; if (lsm6dso_device_id_get(lsm6dso->ctx, &chip_id) < 0) { @@ -790,7 +790,7 @@ static const struct lsm6dso_config lsm6dso_config = { static int lsm6dso_init(struct device *dev) { const struct lsm6dso_config * const config = dev->config; - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; data->bus = device_get_binding(config->bus_name); if (!data->bus) { diff --git a/drivers/sensor/lsm6dso/lsm6dso_i2c.c b/drivers/sensor/lsm6dso/lsm6dso_i2c.c index f9de5e56944..893ed5e1d68 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_i2c.c +++ b/drivers/sensor/lsm6dso/lsm6dso_i2c.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lsm6dso_data *data = dev->data; const struct lsm6dso_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -33,7 +33,7 @@ static int lsm6dso_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct lsm6dso_data *data = dev->data; const struct lsm6dso_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -42,7 +42,7 @@ static int lsm6dso_i2c_write(struct device *dev, uint8_t reg_addr, int lsm6dso_i2c_init(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) lsm6dso_i2c_read, data->ctx_i2c.write_reg = (stmdev_write_ptr) lsm6dso_i2c_write, diff --git a/drivers/sensor/lsm6dso/lsm6dso_shub.c b/drivers/sensor/lsm6dso/lsm6dso_shub.c index ca5b2d3fe42..db42ef94529 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_shub.c +++ b/drivers/sensor/lsm6dso/lsm6dso_shub.c @@ -680,7 +680,7 @@ int lsm6dso_shub_get_idx(enum sensor_channel type) int lsm6dso_shub_fetch_external_devs(struct device *dev) { uint8_t n; - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; struct lsm6dso_shub_slist *sp; /* read data from external slave */ @@ -705,7 +705,7 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; struct lsm6dso_shub_slist *sp = NULL; uint8_t n; @@ -731,7 +731,7 @@ int lsm6dso_shub_config(struct device *dev, enum sensor_channel chan, int lsm6dso_shub_init(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; uint8_t i, n = 0, regn; uint8_t chip_id; struct lsm6dso_shub_slist *sp; diff --git a/drivers/sensor/lsm6dso/lsm6dso_spi.c b/drivers/sensor/lsm6dso/lsm6dso_spi.c index e12afce349b..93d66031c72 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_spi.c +++ b/drivers/sensor/lsm6dso/lsm6dso_spi.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lsm6dso_data *data = dev->data; 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 }; @@ -65,7 +65,7 @@ static int lsm6dso_spi_read(struct device *dev, uint8_t reg_addr, 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; + struct lsm6dso_data *data = dev->data; 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 }; @@ -98,7 +98,7 @@ static int lsm6dso_spi_write(struct device *dev, uint8_t reg_addr, int lsm6dso_spi_init(struct device *dev) { - struct lsm6dso_data *data = dev->driver_data; + struct lsm6dso_data *data = dev->data; data->ctx_spi.read_reg = (stmdev_read_ptr) lsm6dso_spi_read, data->ctx_spi.write_reg = (stmdev_write_ptr) lsm6dso_spi_write, diff --git a/drivers/sensor/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/lsm6dso/lsm6dso_trigger.c index c9129e0008a..19b753648e7 100644 --- a/drivers/sensor/lsm6dso/lsm6dso_trigger.c +++ b/drivers/sensor/lsm6dso/lsm6dso_trigger.c @@ -26,7 +26,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; - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; lsm6dso_pin_int2_route_t int2_route; if (enable) { @@ -54,7 +54,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; - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; if (enable) { union axis3bit16_t buf; @@ -90,7 +90,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; - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; if (enable) { union axis3bit16_t buf; @@ -126,7 +126,7 @@ int lsm6dso_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; if (trig->chan == SENSOR_CHAN_ACCEL_XYZ) { lsm6dso->handler_drdy_acc = handler; @@ -164,7 +164,7 @@ int lsm6dso_trigger_set(struct device *dev, static void lsm6dso_handle_interrupt(void *arg) { struct device *dev = arg; - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; struct sensor_trigger drdy_trigger = { .type = SENSOR_TRIG_DATA_READY, }; @@ -227,7 +227,7 @@ static void lsm6dso_gpio_callback(struct device *dev, static void lsm6dso_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; ARG_UNUSED(unused); @@ -250,7 +250,7 @@ static void lsm6dso_work_cb(struct k_work *work) int lsm6dso_init_interrupt(struct device *dev) { - struct lsm6dso_data *lsm6dso = dev->driver_data; + struct lsm6dso_data *lsm6dso = dev->data; const struct lsm6dso_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c index 5ac01ff273a..da5331b0371 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(LSM9DS0_GYRO, CONFIG_SENSOR_LOG_LEVEL); 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; + struct lsm9ds0_gyro_data *data = dev->data; 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) | @@ -43,7 +43,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; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -84,7 +84,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; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -121,7 +121,7 @@ static int lsm9ds0_gyro_set_odr(struct device *dev, int odr) static int lsm9ds0_gyro_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config *config = dev->config; uint8_t x_l, x_h, y_l, y_h, z_l, z_h; @@ -196,7 +196,7 @@ static int lsm9ds0_gyro_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; #if defined(CONFIG_LSM9DS0_GYRO_FULLSCALE_RUNTIME) switch (data->sample_fs) { @@ -261,7 +261,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; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config *config = dev->config; uint8_t chip_id; @@ -318,7 +318,7 @@ err_poweroff: static int lsm9ds0_gyro_init(struct device *dev) { const struct lsm9ds0_gyro_config * const config = dev->config; - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c index a31ccf7d5f3..3f2f92fec39 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(LSM9DS0_GYRO, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_drdy(struct device *dev, bool enable) { - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config *cfg = dev->config; gpio_pin_interrupt_configure(data->gpio_drdy, @@ -37,7 +37,7 @@ int lsm9ds0_gyro_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; const struct lsm9ds0_gyro_config * const config = dev->config; uint8_t state; @@ -84,7 +84,7 @@ static void lsm9ds0_gyro_gpio_drdy_callback(struct device *dev, static void lsm9ds0_gyro_thread_main(void *arg1, void *arg2, void *arg3) { struct device *dev = (struct device *) arg1; - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->data; while (1) { k_sem_take(&data->sem, K_FOREVER); @@ -101,7 +101,7 @@ int lsm9ds0_gyro_init_interrupt(struct device *dev) { const struct lsm9ds0_gyro_config * const config = dev->config; - struct lsm9ds0_gyro_data *data = dev->driver_data; + struct lsm9ds0_gyro_data *data = dev->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 b2b09850fcc..627531d0738 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -25,7 +25,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; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -44,7 +44,7 @@ static inline int lsm9ds0_mfd_reboot_memory(struct device *dev) #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) static inline int lsm9ds0_mfd_accel_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -88,7 +88,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; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -133,7 +133,7 @@ static int lsm9ds0_mfd_accel_set_fs(struct device *dev, int val) #if !defined(LSM9DS0_MFD_MAGN_DISABLED) static inline int lsm9ds0_mfd_magn_set_odr_raw(struct device *dev, uint8_t odr) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; return i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -173,7 +173,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; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; if (i2c_reg_update_byte(data->i2c_master, config->i2c_slave_addr, @@ -218,7 +218,7 @@ static int lsm9ds0_mfd_magn_set_fs(struct device *dev, #if !defined(LSM9DS0_MFD_ACCEL_DISABLED) static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; @@ -272,7 +272,7 @@ static inline int lsm9ds0_mfd_sample_fetch_accel(struct device *dev) #if !defined(LSM9DS0_MFD_MAGN_DISABLED) static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; @@ -320,7 +320,7 @@ static inline int lsm9ds0_mfd_sample_fetch_magn(struct device *dev) #if !defined(LSM9DS0_MFD_TEMP_DISABLED) static inline int lsm9ds0_mfd_sample_fetch_temp(struct device *dev) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; uint8_t out_l, out_h; @@ -430,7 +430,7 @@ static inline int lsm9ds0_mfd_get_accel(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; #if defined(CONFIG_LSM9DS0_MFD_ACCEL_FULL_SCALE_RUNTIME) switch (data->sample_accel_fs) { @@ -516,7 +516,7 @@ static inline int lsm9ds0_mfd_get_magn(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; #if defined(CONFIG_LSM9DS0_MFD_MAGN_FULL_SCALE_RUNTIME) switch (data->sample_magn_fs) { @@ -554,7 +554,7 @@ static int lsm9ds0_mfd_channel_get(struct device *dev, struct sensor_value *val) { #if !defined(LSM9DS0_MFD_TEMP_DISABLED) - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; #endif switch (chan) { @@ -667,7 +667,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; + struct lsm9ds0_mfd_data *data = dev->data; const struct lsm9ds0_mfd_config *config = dev->config; uint8_t chip_id; @@ -770,7 +770,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; - struct lsm9ds0_mfd_data *data = dev->driver_data; + struct lsm9ds0_mfd_data *data = dev->data; data->i2c_master = device_get_binding(config->i2c_master_dev_name); if (!data->i2c_master) { diff --git a/drivers/sensor/max17055/max17055.c b/drivers/sensor/max17055/max17055.c index 90d22ff24e0..a5ac661fb05 100644 --- a/drivers/sensor/max17055/max17055.c +++ b/drivers/sensor/max17055/max17055.c @@ -79,7 +79,7 @@ static int max17055_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *valp) { const struct max17055_config *const config = dev->config; - struct max17055_data *const priv = dev->driver_data; + struct max17055_data *const priv = dev->data; unsigned int tmp; switch (chan) { @@ -160,7 +160,7 @@ static int max17055_channel_get(struct device *dev, enum sensor_channel chan, static int max17055_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct max17055_data *priv = dev->driver_data; + struct max17055_data *priv = dev->data; struct { int reg_addr; int16_t *dest; @@ -199,7 +199,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; + struct max17055_data *priv = dev->data; const struct max17055_config *const config = dev->config; priv->i2c = device_get_binding(config->bus_name); diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c index a7dd72aa0e0..1047ce7b5ee 100644 --- a/drivers/sensor/max30101/max30101.c +++ b/drivers/sensor/max30101/max30101.c @@ -14,7 +14,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; + struct max30101_data *data = dev->data; const struct max30101_config *config = dev->config; uint8_t buffer[MAX30101_MAX_BYTES_PER_SAMPLE]; uint32_t fifo_data; @@ -47,7 +47,7 @@ static int max30101_sample_fetch(struct device *dev, enum sensor_channel chan) static int max30101_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct max30101_data *data = dev->driver_data; + struct max30101_data *data = dev->data; enum max30101_led_channel led_chan; int fifo_chan; @@ -94,7 +94,7 @@ static const struct sensor_driver_api max30101_driver_api = { static int max30101_init(struct device *dev) { const struct max30101_config *config = dev->config; - struct max30101_data *data = dev->driver_data; + struct max30101_data *data = dev->data; uint8_t part_id; uint8_t mode_cfg; uint32_t led_chan; diff --git a/drivers/sensor/max44009/max44009.c b/drivers/sensor/max44009/max44009.c index fe72df3c1d2..8eda76fb123 100644 --- a/drivers/sensor/max44009/max44009.c +++ b/drivers/sensor/max44009/max44009.c @@ -73,7 +73,7 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct max44009_data *drv_data = dev->driver_data; + struct max44009_data *drv_data = dev->data; uint8_t value; uint32_t cr; @@ -113,7 +113,7 @@ static int max44009_attr_set(struct device *dev, enum sensor_channel chan, static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct max44009_data *drv_data = dev->driver_data; + struct max44009_data *drv_data = dev->data; uint8_t val_h, val_l; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_LIGHT); @@ -139,7 +139,7 @@ static int max44009_sample_fetch(struct device *dev, enum sensor_channel chan) static int max44009_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct max44009_data *drv_data = dev->driver_data; + struct max44009_data *drv_data = dev->data; uint32_t uval; if (chan != SENSOR_CHAN_LIGHT) { @@ -171,7 +171,7 @@ static const struct sensor_driver_api max44009_driver_api = { int max44009_init(struct device *dev) { - struct max44009_data *drv_data = dev->driver_data; + struct max44009_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c index 860cadec905..2f488a8e728 100644 --- a/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c +++ b/drivers/sensor/mchp_tach_xec/tach_mchp_xec.c @@ -39,7 +39,7 @@ struct tach_xec_data { _dev->config)) #define TACH_XEC_DATA(_dev) \ - ((struct tach_xec_data *)dev->driver_data) + ((struct tach_xec_data *)dev->data) int tach_xec_sample_fetch(struct device *dev, enum sensor_channel chan) diff --git a/drivers/sensor/mcp9808/mcp9808.c b/drivers/sensor/mcp9808/mcp9808.c index fc6bb57880e..373c3221d68 100644 --- a/drivers/sensor/mcp9808/mcp9808.c +++ b/drivers/sensor/mcp9808/mcp9808.c @@ -22,7 +22,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_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; int rc = i2c_write_read(data->i2c_master, cfg->i2c_addr, ®, sizeof(reg), @@ -37,7 +37,7 @@ int mcp9808_reg_read(struct device *dev, uint8_t reg, uint16_t *val) static int mcp9808_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -48,7 +48,7 @@ static int mcp9808_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct mcp9808_data *data = dev->driver_data; + const struct mcp9808_data *data = dev->data; int temp = mcp9808_temp_signed_from_reg(data->reg_val); __ASSERT_NO_MSG(chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -71,7 +71,7 @@ static const struct sensor_driver_api mcp9808_api_funcs = { int mcp9808_init(struct device *dev) { - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; int rc = 0; diff --git a/drivers/sensor/mcp9808/mcp9808_trigger.c b/drivers/sensor/mcp9808/mcp9808_trigger.c index 95c3fa1e99d..7326627ba81 100644 --- a/drivers/sensor/mcp9808/mcp9808_trigger.c +++ b/drivers/sensor/mcp9808/mcp9808_trigger.c @@ -16,7 +16,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_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; uint8_t buf[3] = { reg, @@ -60,7 +60,7 @@ int mcp9808_attr_set(struct device *dev, enum sensor_channel chan, static inline void setup_int(struct device *dev, bool enable) { - const struct mcp9808_data *data = dev->driver_data; + const struct mcp9808_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; unsigned int flags = enable ? GPIO_INT_EDGE_TO_ACTIVE @@ -71,7 +71,7 @@ static inline void setup_int(struct device *dev, static void handle_int(struct device *dev) { - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; setup_int(dev, false); @@ -84,7 +84,7 @@ static void handle_int(struct device *dev) static void process_int(struct device *dev) { - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; if (data->trigger_handler) { data->trigger_handler(dev, &data->trig); @@ -99,7 +99,7 @@ int mcp9808_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; int rv = 0; @@ -136,7 +136,7 @@ static void alert_cb(struct device *dev, struct gpio_callback *cb, uint32_t pins static void mcp9808_thread_main(int arg1, int arg2) { struct device *dev = INT_TO_POINTER(arg1); - struct mcp9808_data *data = dev->driver_data; + struct mcp9808_data *data = dev->data; ARG_UNUSED(arg2); @@ -162,7 +162,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; + struct mcp9808_data *data = dev->data; const struct mcp9808_config *cfg = dev->config; struct device *gpio; int rc = mcp9808_reg_write(dev, MCP9808_REG_CRITICAL, diff --git a/drivers/sensor/mpr/mpr.c b/drivers/sensor/mpr/mpr.c index a678c672fec..ef9814c9fae 100644 --- a/drivers/sensor/mpr/mpr.c +++ b/drivers/sensor/mpr/mpr.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(MPR, CONFIG_SENSOR_LOG_LEVEL); static int mpr_init(struct device *dev) { - struct mpr_data *data = dev->driver_data; + struct mpr_data *data = dev->data; const struct mpr_config *cfg = dev->config; data->i2c_master = device_get_binding(cfg->i2c_bus); @@ -36,7 +36,7 @@ static int mpr_init(struct device *dev) static int mpr_read_reg(struct device *dev) { - struct mpr_data *data = dev->driver_data; + struct mpr_data *data = dev->data; const struct mpr_config *cfg = dev->config; uint8_t write_buf[] = { MPR_OUTPUT_MEASUREMENT_COMMAND, 0x00, 0x00 }; @@ -111,7 +111,7 @@ static int mpr_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct mpr_data *data = dev->driver_data; + const struct mpr_data *data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_PRESS); diff --git a/drivers/sensor/mpu6050/mpu6050.c b/drivers/sensor/mpu6050/mpu6050.c index 50a8c0fe742..708cd2c0633 100644 --- a/drivers/sensor/mpu6050/mpu6050.c +++ b/drivers/sensor/mpu6050/mpu6050.c @@ -59,7 +59,7 @@ static int mpu6050_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct mpu6050_data *drv_data = dev->driver_data; + struct mpu6050_data *drv_data = dev->data; switch (chan) { case SENSOR_CHAN_ACCEL_XYZ: @@ -111,7 +111,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; + struct mpu6050_data *drv_data = dev->data; const struct mpu6050_config *cfg = dev->config; int16_t buf[7]; @@ -142,7 +142,7 @@ static const struct sensor_driver_api mpu6050_driver_api = { int mpu6050_init(struct device *dev) { - struct mpu6050_data *drv_data = dev->driver_data; + struct mpu6050_data *drv_data = dev->data; const struct mpu6050_config *cfg = dev->config; uint8_t id, i; diff --git a/drivers/sensor/mpu6050/mpu6050_trigger.c b/drivers/sensor/mpu6050/mpu6050_trigger.c index ecd2cc559c1..73dba91a248 100644 --- a/drivers/sensor/mpu6050/mpu6050_trigger.c +++ b/drivers/sensor/mpu6050/mpu6050_trigger.c @@ -18,7 +18,7 @@ int mpu6050_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct mpu6050_data *drv_data = dev->driver_data; + struct mpu6050_data *drv_data = dev->data; const struct mpu6050_config *cfg = dev->config; if (trig->type != SENSOR_TRIG_DATA_READY) { @@ -63,7 +63,7 @@ static void mpu6050_gpio_callback(struct device *dev, static void mpu6050_thread_cb(void *arg) { struct device *dev = arg; - struct mpu6050_data *drv_data = dev->driver_data; + struct mpu6050_data *drv_data = dev->data; const struct mpu6050_config *cfg = dev->config; if (drv_data->data_ready_handler != NULL) { @@ -80,7 +80,7 @@ static void mpu6050_thread_cb(void *arg) static void mpu6050_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct mpu6050_data *drv_data = dev->driver_data; + struct mpu6050_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -103,7 +103,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; + struct mpu6050_data *drv_data = dev->data; const struct mpu6050_config *cfg = dev->config; /* setup data ready gpio interrupt */ diff --git a/drivers/sensor/ms5607/ms5607.c b/drivers/sensor/ms5607/ms5607.c index 315ebc79321..42ee65c72a7 100644 --- a/drivers/sensor/ms5607/ms5607.c +++ b/drivers/sensor/ms5607/ms5607.c @@ -111,7 +111,7 @@ static int ms5607_get_measurement(const struct ms5607_data *data, static int ms5607_sample_fetch(struct device *dev, enum sensor_channel channel) { - struct ms5607_data *data = dev->driver_data; + struct ms5607_data *data = dev->data; int err; uint32_t adc_pressure, adc_temperature; @@ -140,7 +140,7 @@ static int ms5607_sample_fetch(struct device *dev, enum sensor_channel channel) static int ms5607_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct ms5607_data *data = dev->driver_data; + const struct ms5607_data *data = dev->data; switch (chan) { case SENSOR_CHAN_AMBIENT_TEMP: @@ -162,7 +162,7 @@ static int ms5607_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct ms5607_data *data = dev->driver_data; + struct ms5607_data *data = dev->data; uint8_t p_conv_cmd, t_conv_cmd, conv_delay; if (attr != SENSOR_ATTR_OVERSAMPLING) { @@ -229,7 +229,7 @@ static const struct ms5607_config ms5607_config = { static int ms5607_init(struct device *dev) { const struct ms5607_config *const config = dev->config; - struct ms5607_data *data = dev->driver_data; + struct ms5607_data *data = dev->data; struct sensor_value val; int err; diff --git a/drivers/sensor/ms5607/ms5607_spi.c b/drivers/sensor/ms5607/ms5607_spi.c index d4e930066bf..14ea904198e 100644 --- a/drivers/sensor/ms5607/ms5607_spi.c +++ b/drivers/sensor/ms5607/ms5607_spi.c @@ -168,7 +168,7 @@ static const struct ms5607_transfer_function ms5607_spi_transfer_function = { int ms5607_spi_init(struct device *dev) { - struct ms5607_data *data = dev->driver_data; + struct ms5607_data *data = dev->data; data->tf = &ms5607_spi_transfer_function; diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c index 913723fa968..9b0bdc9e60b 100644 --- a/drivers/sensor/ms5837/ms5837.c +++ b/drivers/sensor/ms5837/ms5837.c @@ -99,7 +99,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; + struct ms5837_data *data = dev->data; const struct ms5837_config *cfg = dev->config; int err; uint32_t adc_pressure; @@ -131,7 +131,7 @@ static int ms5837_sample_fetch(struct device *dev, enum sensor_channel channel) static int ms5837_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ms5837_data *data = dev->driver_data; + struct ms5837_data *data = dev->data; switch (chan) { case SENSOR_CHAN_AMBIENT_TEMP: @@ -153,7 +153,7 @@ static int ms5837_attr_set(struct device *dev, enum sensor_channel chan, enum sensor_attribute attr, const struct sensor_value *val) { - struct ms5837_data *data = dev->driver_data; + struct ms5837_data *data = dev->data; uint8_t p_conv_cmd; uint8_t t_conv_cmd; uint8_t conv_delay; @@ -245,7 +245,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; + struct ms5837_data *data = dev->data; const struct ms5837_config *cfg = dev->config; int err; uint8_t cmd; diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c index 41af0db4ccc..5b0b6eeb571 100644 --- a/drivers/sensor/nrf5/temp_nrf5.c +++ b/drivers/sensor/nrf5/temp_nrf5.c @@ -39,7 +39,7 @@ static void hfclk_on_callback(struct onoff_manager *mgr, static int temp_nrf5_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct temp_nrf5_data *data = dev->driver_data; + struct temp_nrf5_data *data = dev->data; struct onoff_client cli; int r; @@ -76,7 +76,7 @@ static int temp_nrf5_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct temp_nrf5_data *data = dev->driver_data; + struct temp_nrf5_data *data = dev->data; int32_t uval; @@ -96,7 +96,7 @@ static int temp_nrf5_channel_get(struct device *dev, static void temp_nrf5_isr(void *arg) { struct device *dev = (struct device *)arg; - struct temp_nrf5_data *data = dev->driver_data; + struct temp_nrf5_data *data = dev->data; nrf_temp_event_clear(NRF_TEMP, NRF_TEMP_EVENT_DATARDY); k_sem_give(&data->device_sync_sem); @@ -111,7 +111,7 @@ DEVICE_DECLARE(temp_nrf5); static int temp_nrf5_init(struct device *dev) { - struct temp_nrf5_data *data = dev->driver_data; + struct temp_nrf5_data *data = dev->data; LOG_DBG(""); diff --git a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c index 33094256556..64d4a827fb3 100644 --- a/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c +++ b/drivers/sensor/nxp_kinetis_temp/temp_kinetis.c @@ -44,7 +44,7 @@ static int temp_kinetis_sample_fetch(struct device *dev, enum sensor_channel chan) { const struct temp_kinetis_config *config = dev->config; - struct temp_kinetis_data *data = dev->driver_data; + struct temp_kinetis_data *data = dev->data; #ifdef CONFIG_TEMP_KINETIS_FILTER uint16_t previous[TEMP_KINETIS_ADC_SAMPLES]; int i; @@ -89,7 +89,7 @@ static int temp_kinetis_channel_get(struct device *dev, struct sensor_value *val) { const struct temp_kinetis_config *config = dev->config; - struct temp_kinetis_data *data = dev->driver_data; + struct temp_kinetis_data *data = dev->data; uint16_t adcr_vdd = BIT_MASK(config->adc_seq.resolution); uint16_t adcr_temp25; int32_t temp_cc; @@ -140,7 +140,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; - struct temp_kinetis_data *data = dev->driver_data; + struct temp_kinetis_data *data = dev->data; int err; int i; const struct adc_channel_cfg ch_cfg[] = { diff --git a/drivers/sensor/opt3001/opt3001.c b/drivers/sensor/opt3001/opt3001.c index f0f5d0a1af4..6294e860e3e 100644 --- a/drivers/sensor/opt3001/opt3001.c +++ b/drivers/sensor/opt3001/opt3001.c @@ -63,7 +63,7 @@ static int opt3001_reg_update(struct opt3001_data *drv_data, uint8_t reg, static int opt3001_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct opt3001_data *drv_data = dev->driver_data; + struct opt3001_data *drv_data = dev->data; uint16_t value; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_LIGHT); @@ -82,7 +82,7 @@ static int opt3001_sample_fetch(struct device *dev, enum sensor_channel chan) static int opt3001_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct opt3001_data *drv_data = dev->driver_data; + struct opt3001_data *drv_data = dev->data; int32_t uval; if (chan != SENSOR_CHAN_LIGHT) { @@ -112,7 +112,7 @@ static const struct sensor_driver_api opt3001_driver_api = { static int opt3001_chip_init(struct device *dev) { - struct opt3001_data *drv_data = dev->driver_data; + struct opt3001_data *drv_data = dev->data; uint16_t value; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/pms7003/pms7003.c b/drivers/sensor/pms7003/pms7003.c index a70426cbab6..98b04ba74aa 100644 --- a/drivers/sensor/pms7003/pms7003.c +++ b/drivers/sensor/pms7003/pms7003.c @@ -104,7 +104,7 @@ static int uart_read_bytes(struct device *dev, uint8_t *data, int len, int timeo static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct pms7003_data *drv_data = dev->driver_data; + struct pms7003_data *drv_data = dev->data; /* sample output */ /* 42 4D 00 1C 00 01 00 01 00 01 00 01 00 01 00 01 01 92 @@ -142,7 +142,7 @@ static int pms7003_sample_fetch(struct device *dev, enum sensor_channel chan) static int pms7003_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct pms7003_data *drv_data = dev->driver_data; + struct pms7003_data *drv_data = dev->data; if (chan == SENSOR_CHAN_PM_1_0) { val->val1 = drv_data->pm_1_0; @@ -166,7 +166,7 @@ static const struct sensor_driver_api pms7003_api = { static int pms7003_init(struct device *dev) { - struct pms7003_data *drv_data = dev->driver_data; + struct pms7003_data *drv_data = dev->data; drv_data->uart_dev = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index 5b61b5a2167..ea4f4764293 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -85,7 +85,7 @@ int sht3xd_write_reg(struct device *dev, uint16_t cmd, uint16_t val) static int sht3xd_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct sht3xd_data *data = dev->driver_data; + struct sht3xd_data *data = dev->data; struct device *i2c = sht3xd_i2c_device(dev); uint8_t address = sht3xd_i2c_address(dev); uint8_t rx_buf[6]; @@ -143,7 +143,7 @@ static int sht3xd_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - const struct sht3xd_data *data = dev->driver_data; + const struct sht3xd_data *data = dev->data; uint64_t tmp; /* @@ -179,7 +179,7 @@ static const struct sensor_driver_api sht3xd_driver_api = { static int sht3xd_init(struct device *dev) { - struct sht3xd_data *data = dev->driver_data; + struct sht3xd_data *data = dev->data; const struct sht3xd_config *cfg = dev->config; struct device *i2c = device_get_binding(cfg->bus_name); diff --git a/drivers/sensor/sht3xd/sht3xd.h b/drivers/sensor/sht3xd/sht3xd.h index 325111c6cb1..ab65216f6f0 100644 --- a/drivers/sensor/sht3xd/sht3xd.h +++ b/drivers/sensor/sht3xd/sht3xd.h @@ -95,7 +95,7 @@ static inline uint8_t sht3xd_i2c_address(struct device *dev) static inline struct device *sht3xd_i2c_device(struct device *dev) { - const struct sht3xd_data *ddp = dev->driver_data; + const struct sht3xd_data *ddp = dev->data; return ddp->bus; } diff --git a/drivers/sensor/sht3xd/sht3xd_trigger.c b/drivers/sensor/sht3xd/sht3xd_trigger.c index f2a5a085234..277ef024d61 100644 --- a/drivers/sensor/sht3xd/sht3xd_trigger.c +++ b/drivers/sensor/sht3xd/sht3xd_trigger.c @@ -37,7 +37,7 @@ int sht3xd_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct sht3xd_data *data = dev->driver_data; + struct sht3xd_data *data = dev->data; uint16_t set_cmd, clear_cmd, reg_val, temp, rh; if (attr == SENSOR_ATTR_LOWER_THRESH) { @@ -84,7 +84,7 @@ int sht3xd_attr_set(struct device *dev, static inline void setup_alert(struct device *dev, bool enable) { - struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; + struct sht3xd_data *data = (struct sht3xd_data *)dev->data; const struct sht3xd_config *cfg = (const struct sht3xd_config *)dev->config; unsigned int flags = enable @@ -99,11 +99,11 @@ static inline void handle_alert(struct device *dev) setup_alert(dev, false); #if defined(CONFIG_SHT3XD_TRIGGER_OWN_THREAD) - struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; + struct sht3xd_data *data = (struct sht3xd_data *)dev->data; k_sem_give(&data->gpio_sem); #elif defined(CONFIG_SHT3XD_TRIGGER_GLOBAL_THREAD) - struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; + struct sht3xd_data *data = (struct sht3xd_data *)dev->data; k_work_submit(&data->work); #endif @@ -113,7 +113,7 @@ int sht3xd_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; + struct sht3xd_data *data = (struct sht3xd_data *)dev->data; const struct sht3xd_config *cfg = (const struct sht3xd_config *)dev->config; @@ -154,7 +154,7 @@ static void sht3xd_gpio_callback(struct device *dev, static void sht3xd_thread_cb(void *arg) { struct device *dev = (struct device *)arg; - struct sht3xd_data *data = (struct sht3xd_data *)dev->driver_data; + struct sht3xd_data *data = (struct sht3xd_data *)dev->data; if (data->handler != NULL) { data->handler(dev, &data->trigger); @@ -167,7 +167,7 @@ static void sht3xd_thread_cb(void *arg) static void sht3xd_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct sht3xd_data *data = dev->driver_data; + struct sht3xd_data *data = dev->data; ARG_UNUSED(unused); @@ -190,7 +190,7 @@ static void sht3xd_work_cb(struct k_work *work) int sht3xd_init_interrupt(struct device *dev) { - struct sht3xd_data *data = dev->driver_data; + struct sht3xd_data *data = dev->data; const struct sht3xd_config *cfg = dev->config; struct device *gpio = device_get_binding(cfg->alert_gpio_name); int rc; diff --git a/drivers/sensor/si7006/si7006.c b/drivers/sensor/si7006/si7006.c index 9be575ff0d6..f605cc62d7d 100644 --- a/drivers/sensor/si7006/si7006.c +++ b/drivers/sensor/si7006/si7006.c @@ -86,7 +86,7 @@ static int si7006_get_old_temperature(struct device *i2c_dev, static int si7006_sample_fetch(struct device *dev, enum sensor_channel chan) { int retval; - struct si7006_data *si_data = dev->driver_data; + struct si7006_data *si_data = dev->data; retval = si7006_get_humidity(si_data->i2c_dev, si_data); if (retval == 0) { @@ -104,7 +104,7 @@ static int si7006_sample_fetch(struct device *dev, enum sensor_channel chan) static int si7006_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct si7006_data *si_data = dev->driver_data; + struct si7006_data *si_data = dev->data; if (chan == SENSOR_CHAN_AMBIENT_TEMP) { @@ -146,7 +146,7 @@ static const struct sensor_driver_api si7006_api = { static int si7006_init(struct device *dev) { - struct si7006_data *drv_data = dev->driver_data; + struct si7006_data *drv_data = dev->data; drv_data->i2c_dev = device_get_binding( DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/si7055/si7055.c b/drivers/sensor/si7055/si7055.c index 6f2b8e36403..1ce8219d674 100644 --- a/drivers/sensor/si7055/si7055.c +++ b/drivers/sensor/si7055/si7055.c @@ -74,7 +74,7 @@ static int si7055_get_temperature(struct device *i2c_dev, static int si7055_sample_fetch(struct device *dev, enum sensor_channel chan) { int retval; - struct si7055_data *si_data = dev->driver_data; + struct si7055_data *si_data = dev->data; retval = si7055_get_temperature(si_data->i2c_dev, si_data); @@ -89,7 +89,7 @@ static int si7055_sample_fetch(struct device *dev, enum sensor_channel chan) static int si7055_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct si7055_data *si_data = dev->driver_data; + struct si7055_data *si_data = dev->data; /* Refer to * https://www.silabs.com/documents/public/data-sheets/Si7050-1-3-4-5-A20.pdf @@ -128,7 +128,7 @@ static const struct sensor_driver_api si7055_api = { static int si7055_init(struct device *dev) { - struct si7055_data *drv_data = dev->driver_data; + struct si7055_data *drv_data = dev->data; drv_data->i2c_dev = device_get_binding( DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/si7060/si7060.c b/drivers/sensor/si7060/si7060.c index ebf48e9805d..578217eeb2f 100644 --- a/drivers/sensor/si7060/si7060.c +++ b/drivers/sensor/si7060/si7060.c @@ -42,7 +42,7 @@ static int si7060_reg_write(struct si7060_data *drv_data, uint8_t reg, static int si7060_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct si7060_data *drv_data = dev->driver_data; + struct si7060_data *drv_data = dev->data; if (si7060_reg_write(drv_data, SI7060_REG_CONFIG, SI7060_ONE_BURST_VALUE) != 0) { @@ -73,7 +73,7 @@ static int si7060_sample_fetch(struct device *dev, enum sensor_channel chan) static int si7060_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct si7060_data *drv_data = dev->driver_data; + struct si7060_data *drv_data = dev->data; int32_t uval; if (chan == SENSOR_CHAN_AMBIENT_TEMP) { @@ -96,7 +96,7 @@ static const struct sensor_driver_api si7060_api = { static int si7060_chip_init(struct device *dev) { - struct si7060_data *drv_data = dev->driver_data; + struct si7060_data *drv_data = dev->data; uint8_t value; drv_data->i2c_dev = device_get_binding( diff --git a/drivers/sensor/stts751/stts751.c b/drivers/sensor/stts751/stts751.c index 7dfdefb034e..b49d455cfee 100644 --- a/drivers/sensor/stts751/stts751.c +++ b/drivers/sensor/stts751/stts751.c @@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(STTS751, CONFIG_SENSOR_LOG_LEVEL); static inline int stts751_set_odr_raw(struct device *dev, uint8_t odr) { - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; return stts751_temp_data_rate_set(data->ctx, odr); } @@ -32,7 +32,7 @@ static inline int stts751_set_odr_raw(struct device *dev, uint8_t odr) static int stts751_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; union axis1bit16_t raw_temp; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -58,7 +58,7 @@ static int stts751_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; if (chan == SENSOR_CHAN_AMBIENT_TEMP) { stts751_temp_convert(val, data->sample_temp); @@ -141,7 +141,7 @@ static const struct sensor_driver_api stts751_api_funcs = { static int stts751_init_chip(struct device *dev) { - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; stts751_id_t chip_id; if (stts751_device_id_get(data->ctx, &chip_id) < 0) { @@ -170,7 +170,7 @@ static int stts751_init_chip(struct device *dev) static int stts751_init(struct device *dev) { const struct stts751_config * const config = dev->config; - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; data->bus = device_get_binding(config->master_dev_name); if (!data->bus) { diff --git a/drivers/sensor/stts751/stts751_i2c.c b/drivers/sensor/stts751/stts751_i2c.c index 86a4466b9e0..93f4125121d 100644 --- a/drivers/sensor/stts751/stts751_i2c.c +++ b/drivers/sensor/stts751/stts751_i2c.c @@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL); 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; + struct stts751_data *data = dev->data; const struct stts751_config *cfg = dev->config; return i2c_burst_read(data->bus, cfg->i2c_slv_addr, @@ -33,7 +33,7 @@ static int stts751_i2c_read(struct device *dev, uint8_t reg_addr, 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; + struct stts751_data *data = dev->data; const struct stts751_config *cfg = dev->config; return i2c_burst_write(data->bus, cfg->i2c_slv_addr, @@ -42,7 +42,7 @@ static int stts751_i2c_write(struct device *dev, uint8_t reg_addr, int stts751_i2c_init(struct device *dev) { - struct stts751_data *data = dev->driver_data; + struct stts751_data *data = dev->data; data->ctx_i2c.read_reg = (stmdev_read_ptr) stts751_i2c_read; data->ctx_i2c.write_reg = (stmdev_write_ptr) stts751_i2c_write; diff --git a/drivers/sensor/stts751/stts751_trigger.c b/drivers/sensor/stts751/stts751_trigger.c index b66fb4912c6..39d4bb3a3c5 100644 --- a/drivers/sensor/stts751/stts751_trigger.c +++ b/drivers/sensor/stts751/stts751_trigger.c @@ -24,7 +24,7 @@ LOG_MODULE_DECLARE(STTS751, CONFIG_SENSOR_LOG_LEVEL); */ static int stts751_enable_int(struct device *dev, int enable) { - struct stts751_data *stts751 = dev->driver_data; + struct stts751_data *stts751 = dev->data; uint8_t en = (enable) ? 0 : 1; return stts751_pin_event_route_set(stts751->ctx, en); @@ -37,7 +37,7 @@ int stts751_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct stts751_data *stts751 = dev->driver_data; + struct stts751_data *stts751 = dev->data; if (trig->chan == SENSOR_CHAN_ALL) { stts751->thsld_handler = handler; @@ -58,7 +58,7 @@ int stts751_trigger_set(struct device *dev, static void stts751_handle_interrupt(void *arg) { struct device *dev = arg; - struct stts751_data *stts751 = dev->driver_data; + struct stts751_data *stts751 = dev->data; const struct stts751_config *cfg = dev->config; struct sensor_trigger thsld_trigger = { .type = SENSOR_TRIG_THRESHOLD, @@ -98,7 +98,7 @@ static void stts751_gpio_callback(struct device *dev, static void stts751_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct stts751_data *stts751 = dev->driver_data; + struct stts751_data *stts751 = dev->data; ARG_UNUSED(unused); @@ -121,7 +121,7 @@ static void stts751_work_cb(struct k_work *work) int stts751_init_interrupt(struct device *dev) { - struct stts751_data *stts751 = dev->driver_data; + struct stts751_data *stts751 = dev->data; const struct stts751_config *cfg = dev->config; int ret; diff --git a/drivers/sensor/sx9500/sx9500.c b/drivers/sensor/sx9500/sx9500.c index a8d7ec412fa..3f863a11527 100644 --- a/drivers/sensor/sx9500/sx9500.c +++ b/drivers/sensor/sx9500/sx9500.c @@ -47,7 +47,7 @@ static uint8_t sx9500_reg_defaults[] = { static int sx9500_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct sx9500_data *data = (struct sx9500_data *) dev->driver_data; + struct sx9500_data *data = (struct sx9500_data *) dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_PROX); @@ -59,7 +59,7 @@ static int sx9500_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct sx9500_data *data = (struct sx9500_data *) dev->driver_data; + struct sx9500_data *data = (struct sx9500_data *) dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_PROX); @@ -80,7 +80,7 @@ static const struct sensor_driver_api sx9500_api_funcs = { static int sx9500_init_chip(struct device *dev) { - struct sx9500_data *data = (struct sx9500_data *) dev->driver_data; + struct sx9500_data *data = (struct sx9500_data *) dev->data; uint8_t val; if (i2c_write(data->i2c_master, sx9500_reg_defaults, @@ -110,7 +110,7 @@ static int sx9500_init_chip(struct device *dev) int sx9500_init(struct device *dev) { - struct sx9500_data *data = dev->driver_data; + struct sx9500_data *data = dev->data; data->i2c_master = device_get_binding(DT_INST_BUS_LABEL(0)); if (!data->i2c_master) { diff --git a/drivers/sensor/sx9500/sx9500_trigger.c b/drivers/sensor/sx9500/sx9500_trigger.c index 3b7371f7061..9de1eace743 100644 --- a/drivers/sensor/sx9500/sx9500_trigger.c +++ b/drivers/sensor/sx9500/sx9500_trigger.c @@ -28,7 +28,7 @@ int sx9500_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct sx9500_data *data = dev->driver_data; + struct sx9500_data *data = dev->data; switch (trig->type) { case SENSOR_TRIG_DATA_READY: @@ -78,7 +78,7 @@ static void sx9500_gpio_cb(struct device *port, static void sx9500_thread_main(int arg1, int unused) { struct device *dev = INT_TO_POINTER(arg1); - struct sx9500_data *data = dev->driver_data; + struct sx9500_data *data = dev->data; uint8_t reg_val; ARG_UNUSED(unused); @@ -118,7 +118,7 @@ static void sx9500_gpio_cb(struct device *port, static void sx9500_gpio_thread_cb(void *arg) { struct device *dev = arg; - struct sx9500_data *data = dev->driver_data; + struct sx9500_data *data = dev->data; uint8_t reg_val; if (i2c_reg_read_byte(data->i2c_master, data->i2c_slave_addr, @@ -149,7 +149,7 @@ static void sx9500_work_cb(struct k_work *work) int sx9500_setup_interrupt(struct device *dev) { - struct sx9500_data *data = dev->driver_data; + struct sx9500_data *data = dev->data; struct device *gpio; #ifdef CONFIG_SX9500_TRIGGER_OWN_THREAD diff --git a/drivers/sensor/th02/th02.c b/drivers/sensor/th02/th02.c index c129a9ee485..5f11594a53e 100644 --- a/drivers/sensor/th02/th02.c +++ b/drivers/sensor/th02/th02.c @@ -86,7 +86,7 @@ uint16_t get_temp(struct device *dev) static int th02_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct th02_data *drv_data = dev->driver_data; + struct th02_data *drv_data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -101,7 +101,7 @@ static int th02_sample_fetch(struct device *dev, enum sensor_channel chan) static int th02_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct th02_data *drv_data = dev->driver_data; + struct th02_data *drv_data = dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_AMBIENT_TEMP || chan == SENSOR_CHAN_HUMIDITY); @@ -126,7 +126,7 @@ static const struct sensor_driver_api th02_driver_api = { static int th02_init(struct device *dev) { - struct th02_data *drv_data = dev->driver_data; + struct th02_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c index 732af8eadb8..2c4af8bd35f 100644 --- a/drivers/sensor/ti_hdc/ti_hdc.c +++ b/drivers/sensor/ti_hdc/ti_hdc.c @@ -37,7 +37,7 @@ static void ti_hdc_gpio_callback(struct device *dev, static int ti_hdc_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct ti_hdc_data *drv_data = dev->driver_data; + struct ti_hdc_data *drv_data = dev->data; uint8_t buf[4]; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); @@ -78,7 +78,7 @@ static int ti_hdc_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct ti_hdc_data *drv_data = dev->driver_data; + struct ti_hdc_data *drv_data = dev->data; uint64_t tmp; /* @@ -120,7 +120,7 @@ static uint16_t read16(struct device *dev, uint8_t a, uint8_t d) static int ti_hdc_init(struct device *dev) { - struct ti_hdc_data *drv_data = dev->driver_data; + struct ti_hdc_data *drv_data = dev->data; uint16_t tmp; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); diff --git a/drivers/sensor/tmp007/tmp007.c b/drivers/sensor/tmp007/tmp007.c index 7362905e4d3..5462d898959 100644 --- a/drivers/sensor/tmp007/tmp007.c +++ b/drivers/sensor/tmp007/tmp007.c @@ -60,7 +60,7 @@ int tmp007_reg_update(struct tmp007_data *drv_data, uint8_t reg, static int tmp007_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; uint16_t val; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -82,7 +82,7 @@ static int tmp007_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; int32_t uval; if (chan != SENSOR_CHAN_AMBIENT_TEMP) { @@ -107,7 +107,7 @@ static const struct sensor_driver_api tmp007_driver_api = { int tmp007_init(struct device *dev) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/tmp007/tmp007_trigger.c b/drivers/sensor/tmp007/tmp007_trigger.c index 2d9f41cb260..213708e1165 100644 --- a/drivers/sensor/tmp007/tmp007_trigger.c +++ b/drivers/sensor/tmp007/tmp007_trigger.c @@ -22,7 +22,7 @@ LOG_MODULE_DECLARE(TMP007, CONFIG_SENSOR_LOG_LEVEL); static inline void setup_int(struct device *dev, bool enable) { - struct tmp007_data *data = dev->driver_data; + struct tmp007_data *data = dev->data; gpio_pin_interrupt_configure(data->gpio, DT_INST_GPIO_PIN(0, int_gpios), @@ -36,7 +36,7 @@ int tmp007_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; int64_t value; uint8_t reg; @@ -81,7 +81,7 @@ static void tmp007_gpio_callback(struct device *dev, static void tmp007_thread_cb(void *arg) { struct device *dev = arg; - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; uint16_t status; if (tmp007_reg_read(drv_data, TMP007_REG_STATUS, &status) < 0) { @@ -105,7 +105,7 @@ static void tmp007_thread_cb(void *arg) static void tmp007_thread(int dev_ptr, int unused) { struct device *dev = INT_TO_POINTER(dev_ptr); - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; ARG_UNUSED(unused); @@ -130,7 +130,7 @@ int tmp007_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; setup_int(dev, false); @@ -149,7 +149,7 @@ int tmp007_trigger_set(struct device *dev, int tmp007_init_interrupt(struct device *dev) { - struct tmp007_data *drv_data = dev->driver_data; + struct tmp007_data *drv_data = dev->data; if (tmp007_reg_update(drv_data, TMP007_REG_CONFIG, TMP007_ALERT_EN_BIT, TMP007_ALERT_EN_BIT) < 0) { diff --git a/drivers/sensor/tmp112/tmp112.c b/drivers/sensor/tmp112/tmp112.c index 40ef5cdf2a0..19795984115 100644 --- a/drivers/sensor/tmp112/tmp112.c +++ b/drivers/sensor/tmp112/tmp112.c @@ -78,7 +78,7 @@ static int tmp112_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct tmp112_data *drv_data = dev->driver_data; + struct tmp112_data *drv_data = dev->data; int64_t value; uint16_t cr; @@ -151,7 +151,7 @@ static int tmp112_attr_set(struct device *dev, static int tmp112_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct tmp112_data *drv_data = dev->driver_data; + struct tmp112_data *drv_data = dev->data; uint16_t val; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL || chan == SENSOR_CHAN_AMBIENT_TEMP); @@ -173,7 +173,7 @@ static int tmp112_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct tmp112_data *drv_data = dev->driver_data; + struct tmp112_data *drv_data = dev->data; int32_t uval; if (chan != SENSOR_CHAN_AMBIENT_TEMP) { @@ -195,7 +195,7 @@ static const struct sensor_driver_api tmp112_driver_api = { int tmp112_init(struct device *dev) { - struct tmp112_data *drv_data = dev->driver_data; + struct tmp112_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/sensor/tmp116/tmp116.c b/drivers/sensor/tmp116/tmp116.c index 32e261f10ed..c75b0cc259f 100644 --- a/drivers/sensor/tmp116/tmp116.c +++ b/drivers/sensor/tmp116/tmp116.c @@ -22,7 +22,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; + struct tmp116_data *drv_data = dev->data; const struct tmp116_dev_config *cfg = dev->config; if (i2c_burst_read(drv_data->i2c, cfg->i2c_addr, reg, (uint8_t *)val, 2) @@ -64,7 +64,7 @@ static inline int tmp116_device_id_check(struct device *dev) static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct tmp116_data *drv_data = dev->driver_data; + struct tmp116_data *drv_data = dev->data; uint16_t value; int rc; @@ -91,7 +91,7 @@ static int tmp116_sample_fetch(struct device *dev, enum sensor_channel chan) static int tmp116_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct tmp116_data *drv_data = dev->driver_data; + struct tmp116_data *drv_data = dev->data; int32_t tmp; if (chan != SENSOR_CHAN_AMBIENT_TEMP) { @@ -116,7 +116,7 @@ static const struct sensor_driver_api tmp116_driver_api = { static int tmp116_init(struct device *dev) { - struct tmp116_data *drv_data = dev->driver_data; + struct tmp116_data *drv_data = dev->data; int rc; /* Bind to the I2C bus that the sensor is connected */ diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c index 2c8cb79fa0b..f34dac6a989 100644 --- a/drivers/sensor/vl53l0x/vl53l0x.c +++ b/drivers/sensor/vl53l0x/vl53l0x.c @@ -47,7 +47,7 @@ struct vl53l0x_data { static int vl53l0x_sample_fetch(struct device *dev, enum sensor_channel chan) { - struct vl53l0x_data *drv_data = dev->driver_data; + struct vl53l0x_data *drv_data = dev->data; VL53L0X_Error ret; __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL @@ -69,7 +69,7 @@ static int vl53l0x_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct vl53l0x_data *drv_data = (struct vl53l0x_data *)dev->driver_data; + struct vl53l0x_data *drv_data = (struct vl53l0x_data *)dev->data; __ASSERT_NO_MSG(chan == SENSOR_CHAN_DISTANCE || chan == SENSOR_CHAN_PROX); @@ -97,7 +97,7 @@ static const struct sensor_driver_api vl53l0x_api_funcs = { static int vl53l0x_setup_single_shot(struct device *dev) { - struct vl53l0x_data *drv_data = dev->driver_data; + struct vl53l0x_data *drv_data = dev->data; int ret; uint8_t VhvSettings; uint8_t PhaseCal; @@ -197,7 +197,7 @@ exit: static int vl53l0x_init(struct device *dev) { - struct vl53l0x_data *drv_data = dev->driver_data; + struct vl53l0x_data *drv_data = dev->data; VL53L0X_Error ret; uint16_t vl53l0x_id = 0U; VL53L0X_DeviceInfo_t vl53l0x_dev_info; diff --git a/drivers/sensor/wsen_itds/itds.c b/drivers/sensor/wsen_itds/itds.c index 85c53a67cd8..6bf8821522e 100644 --- a/drivers/sensor/wsen_itds/itds.c +++ b/drivers/sensor/wsen_itds/itds.c @@ -35,7 +35,7 @@ static const unsigned int itds_sensitivity_scale[][ITDS_ACCL_RANGE_END] = { static int itds_get_odr_for_index(struct device *dev, enum itds_odr_const idx, uint16_t *freq, uint16_t *mfreq) { - struct itds_device_data *ddata = dev->driver_data; + struct itds_device_data *ddata = dev->data; int start, end; bool hp_mode; @@ -61,7 +61,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; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; int start, end, i; bool hp_mode; @@ -90,7 +90,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; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; int i, ret; bool hp_mode; @@ -214,7 +214,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; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; switch (chan) { @@ -237,7 +237,7 @@ static inline void itds_accl_channel_get(struct device *dev, struct sensor_value *val) { int i; - struct itds_device_data *ddata = dev->driver_data; + struct itds_device_data *ddata = dev->data; uint8_t ofs_start, ofs_stop; switch (chan) { @@ -270,7 +270,7 @@ static inline void itds_accl_channel_get(struct device *dev, static int itds_temp_channel_get(struct device *dev, struct sensor_value *val) { int32_t temp_processed; - struct itds_device_data *ddata = dev->driver_data; + struct itds_device_data *ddata = dev->data; temp_processed = (ddata->temprature >> 4) * ITDS_TEMP_CONST; @@ -305,7 +305,7 @@ static int itds_channel_get(struct device *dev, static int itds_init(struct device *dev) { - struct itds_device_data *ddata = dev->driver_data; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; int ret; uint16_t freq, mfreq; diff --git a/drivers/sensor/wsen_itds/itds_trigger.c b/drivers/sensor/wsen_itds/itds_trigger.c index 3217f6cf596..f7ad888c8c7 100644 --- a/drivers/sensor/wsen_itds/itds_trigger.c +++ b/drivers/sensor/wsen_itds/itds_trigger.c @@ -19,7 +19,7 @@ static int itds_trigger_drdy_set(struct device *dev, enum sensor_channel chan, sensor_trigger_handler_t handler) { - struct itds_device_data *ddata = dev->driver_data; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; uint8_t drdy_en = 0U; int ret; @@ -93,7 +93,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; + struct itds_device_data *ddata = dev->data; const struct itds_device_config *cfg = dev->config; ddata->gpio = device_get_binding(cfg->gpio_port); diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c index 2faaf824831..e77a0645b24 100644 --- a/drivers/serial/leuart_gecko.c +++ b/drivers/serial/leuart_gecko.c @@ -21,7 +21,7 @@ #define DEV_CFG(dev) \ ((const struct leuart_gecko_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct leuart_gecko_data * const)(dev)->driver_data) + ((struct leuart_gecko_data * const)(dev)->data) #define DEV_BASE(dev) \ ((LEUART_TypeDef *)(DEV_CFG(dev))->base) @@ -225,7 +225,7 @@ static void leuart_gecko_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct leuart_gecko_data *data = dev->driver_data; + struct leuart_gecko_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -234,7 +234,7 @@ static void leuart_gecko_irq_callback_set(struct device *dev, static void leuart_gecko_isr(void *arg) { struct device *dev = arg; - struct leuart_gecko_data *data = dev->driver_data; + struct leuart_gecko_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index c16abf85bfb..0d52e0a9be3 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -42,7 +42,7 @@ struct uart_cc13xx_cc26xx_data { static inline struct uart_cc13xx_cc26xx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct uart_device_config *get_dev_conf(struct device *dev) diff --git a/drivers/serial/uart_cc32xx.c b/drivers/serial/uart_cc32xx.c index 92a74910154..89e4f7fb071 100644 --- a/drivers/serial/uart_cc32xx.c +++ b/drivers/serial/uart_cc32xx.c @@ -27,7 +27,7 @@ struct uart_cc32xx_dev_data_t { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_cc32xx_dev_data_t * const)(dev)->driver_data) + ((struct uart_cc32xx_dev_data_t * const)(dev)->data) #define PRIME_CHAR '\r' diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c index 9bae2ec70d2..16ccd0f3d04 100644 --- a/drivers/serial/uart_cmsdk_apb.c +++ b/drivers/serial/uart_cmsdk_apb.c @@ -79,7 +79,7 @@ struct uart_cmsdk_apb_dev_data { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_cmsdk_apb_dev_data * const)(dev)->driver_data) + ((struct uart_cmsdk_apb_dev_data * const)(dev)->data) #define UART_STRUCT(dev) \ ((volatile struct uart_cmsdk_apb *)(DEV_CFG(dev))->base) diff --git a/drivers/serial/uart_esp32.c b/drivers/serial/uart_esp32.c index 02b9083a959..06ace97c48b 100644 --- a/drivers/serial/uart_esp32.c +++ b/drivers/serial/uart_esp32.c @@ -100,7 +100,7 @@ struct uart_esp32_data { #define DEV_CFG(dev) \ ((const struct uart_esp32_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_esp32_data *)(dev)->driver_data) + ((struct uart_esp32_data *)(dev)->data) #define DEV_BASE(dev) \ ((volatile struct uart_esp32_regs_t *)(DEV_CFG(dev))->dev_conf.base) diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c index 34a262ebef1..bf64959aff2 100644 --- a/drivers/serial/uart_gecko.c +++ b/drivers/serial/uart_gecko.c @@ -217,7 +217,7 @@ static void uart_gecko_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct uart_gecko_data *data = dev->driver_data; + struct uart_gecko_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -226,7 +226,7 @@ static void uart_gecko_irq_callback_set(struct device *dev, static void uart_gecko_isr(void *arg) { struct device *dev = arg; - struct uart_gecko_data *data = dev->driver_data; + struct uart_gecko_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_imx.c b/drivers/serial/uart_imx.c index 127cc48e4ef..59df2b9e59e 100644 --- a/drivers/serial/uart_imx.c +++ b/drivers/serial/uart_imx.c @@ -231,7 +231,7 @@ static void uart_imx_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct imx_uart_data *data = dev->driver_data; + struct imx_uart_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -252,7 +252,7 @@ static void uart_imx_irq_callback_set(struct device *dev, void uart_imx_isr(void *arg) { struct device *dev = arg; - struct imx_uart_data *data = dev->driver_data; + struct imx_uart_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_liteuart.c b/drivers/serial/uart_liteuart.c index b722adf005f..0c43522bc22 100644 --- a/drivers/serial/uart_liteuart.c +++ b/drivers/serial/uart_liteuart.c @@ -267,7 +267,7 @@ static void uart_liteuart_irq_callback_set(struct device *dev, { struct uart_liteuart_data *data; - data = (struct uart_liteuart_data *)dev->driver_data; + data = (struct uart_liteuart_data *)dev->data; data->callback = cb; data->cb_data = cb_data; } diff --git a/drivers/serial/uart_lpc11u6x.c b/drivers/serial/uart_lpc11u6x.c index 3012a784d57..de9c8f292a0 100644 --- a/drivers/serial/uart_lpc11u6x.c +++ b/drivers/serial/uart_lpc11u6x.c @@ -14,7 +14,7 @@ #include "uart_lpc11u6x.h" #define DEV_CFG(dev) ((dev)->config) -#define DEV_DATA(dev) ((dev)->driver_data) +#define DEV_DATA(dev) ((dev)->data) #if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay) static int lpc11u6x_uart0_poll_in(struct device *dev, unsigned char *c) diff --git a/drivers/serial/uart_mcux.c b/drivers/serial/uart_mcux.c index b9b26781bc1..622c951e942 100644 --- a/drivers/serial/uart_mcux.c +++ b/drivers/serial/uart_mcux.c @@ -286,7 +286,7 @@ static void uart_mcux_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct uart_mcux_data *data = dev->driver_data; + struct uart_mcux_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -295,7 +295,7 @@ static void uart_mcux_irq_callback_set(struct device *dev, static void uart_mcux_isr(void *arg) { struct device *dev = arg; - struct uart_mcux_data *data = dev->driver_data; + struct uart_mcux_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_mcux_flexcomm.c b/drivers/serial/uart_mcux_flexcomm.c index ac95a5c32eb..480a71ff62b 100644 --- a/drivers/serial/uart_mcux_flexcomm.c +++ b/drivers/serial/uart_mcux_flexcomm.c @@ -224,7 +224,7 @@ static void mcux_flexcomm_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -233,7 +233,7 @@ static void mcux_flexcomm_irq_callback_set(struct device *dev, static void mcux_flexcomm_isr(void *arg) { struct device *dev = arg; - struct mcux_flexcomm_data *data = dev->driver_data; + struct mcux_flexcomm_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_mcux_lpsci.c b/drivers/serial/uart_mcux_lpsci.c index f01d3415577..de053cf1810 100644 --- a/drivers/serial/uart_mcux_lpsci.c +++ b/drivers/serial/uart_mcux_lpsci.c @@ -215,7 +215,7 @@ static void mcux_lpsci_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct mcux_lpsci_data *data = dev->driver_data; + struct mcux_lpsci_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -224,7 +224,7 @@ static void mcux_lpsci_irq_callback_set(struct device *dev, static void mcux_lpsci_isr(void *arg) { struct device *dev = arg; - struct mcux_lpsci_data *data = dev->driver_data; + struct mcux_lpsci_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c index fbadbcad2b5..21c48f63731 100644 --- a/drivers/serial/uart_mcux_lpuart.c +++ b/drivers/serial/uart_mcux_lpuart.c @@ -215,7 +215,7 @@ static void mcux_lpuart_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct mcux_lpuart_data *data = dev->driver_data; + struct mcux_lpuart_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -224,7 +224,7 @@ static void mcux_lpuart_irq_callback_set(struct device *dev, static void mcux_lpuart_isr(void *arg) { struct device *dev = arg; - struct mcux_lpuart_data *data = dev->driver_data; + struct mcux_lpuart_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_miv.c b/drivers/serial/uart_miv.c index dfe1f11f70a..e82d2272399 100644 --- a/drivers/serial/uart_miv.c +++ b/drivers/serial/uart_miv.c @@ -150,7 +150,7 @@ struct uart_miv_data { #define DEV_UART(dev) \ ((struct uart_miv_regs_t *)(DEV_CFG(dev))->uart_addr) #define DEV_DATA(dev) \ - ((struct uart_miv_data * const)(dev)->driver_data) + ((struct uart_miv_data * const)(dev)->data) static void uart_miv_poll_out(struct device *dev, unsigned char c) diff --git a/drivers/serial/uart_msp432p4xx.c b/drivers/serial/uart_msp432p4xx.c index b54b6238ef0..aee79e92ae9 100644 --- a/drivers/serial/uart_msp432p4xx.c +++ b/drivers/serial/uart_msp432p4xx.c @@ -31,7 +31,7 @@ struct uart_msp432p4xx_dev_data_t { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_msp432p4xx_dev_data_t * const)(dev)->driver_data) + ((struct uart_msp432p4xx_dev_data_t * const)(dev)->data) DEVICE_DECLARE(uart_msp432p4xx_0); diff --git a/drivers/serial/uart_native_posix.c b/drivers/serial/uart_native_posix.c index 4aaa217b5d7..be91880de2e 100644 --- a/drivers/serial/uart_native_posix.c +++ b/drivers/serial/uart_native_posix.c @@ -200,7 +200,7 @@ static int np_uart_0_init(struct device *dev) { struct native_uart_status *d; - d = (struct native_uart_status *)dev->driver_data; + d = (struct native_uart_status *)dev->data; if (IS_ENABLED(CONFIG_NATIVE_UART_0_ON_OWN_PTY)) { int tty_fn = open_tty(d, DT_INST_LABEL(0), @@ -238,7 +238,7 @@ static int np_uart_1_init(struct device *dev) struct native_uart_status *d; int tty_fn; - d = (struct native_uart_status *)dev->driver_data; + d = (struct native_uart_status *)dev->data; tty_fn = open_tty(d, CONFIG_UART_NATIVE_POSIX_PORT_1_NAME, false); @@ -261,7 +261,7 @@ static void np_uart_poll_out(struct device *dev, int ret; struct native_uart_status *d; - d = (struct native_uart_status *)dev->driver_data; + d = (struct native_uart_status *)dev->data; ret = write(d->out_fd, &out_char, 1); if (ret != 1) { @@ -292,7 +292,7 @@ static int np_uart_stdin_poll_in(struct device *dev, unsigned char *p_char) } int n = -1; - int in_f = ((struct native_uart_status *)dev->driver_data)->in_fd; + int in_f = ((struct native_uart_status *)dev->data)->in_fd; int ready; fd_set readfds; @@ -329,7 +329,7 @@ static int np_uart_stdin_poll_in(struct device *dev, unsigned char *p_char) static int np_uart_tty_poll_in(struct device *dev, unsigned char *p_char) { int n = -1; - int in_f = ((struct native_uart_status *)dev->driver_data)->in_fd; + int in_f = ((struct native_uart_status *)dev->data)->in_fd; n = read(in_f, p_char, 1); if (n == -1) { diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c index 4a06213cde0..b74c0d96457 100644 --- a/drivers/serial/uart_nrfx_uart.c +++ b/drivers/serial/uart_nrfx_uart.c @@ -61,7 +61,7 @@ struct uart_nrfx_data { static inline struct uart_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } #ifdef CONFIG_UART_0_ASYNC diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index e68163ccddf..9eb1feea1bc 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -141,7 +141,7 @@ struct uarte_init_config { static inline struct uarte_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct uarte_nrfx_config *get_dev_config(struct device *dev) diff --git a/drivers/serial/uart_ns16550.c b/drivers/serial/uart_ns16550.c index 9dcd76680fc..797fac97ded 100644 --- a/drivers/serial/uart_ns16550.c +++ b/drivers/serial/uart_ns16550.c @@ -205,7 +205,7 @@ BUILD_ASSERT(IS_ENABLED(CONFIG_PCIE), "NS16550(s) in DT need CONFIG_PCIE"); ((const struct uart_ns16550_device_config * const) \ (dev)->config) #define DEV_DATA(dev) \ - ((struct uart_ns16550_dev_data_t *)(dev)->driver_data) + ((struct uart_ns16550_dev_data_t *)(dev)->data) #define THR(dev) (get_port(dev) + REG_THR * UART_REG_ADDR_INTERVAL) #define RDR(dev) (get_port(dev) + REG_RDR * UART_REG_ADDR_INTERVAL) diff --git a/drivers/serial/uart_nuvoton.c b/drivers/serial/uart_nuvoton.c index 6d0d11cbe44..d7b0ce97b21 100644 --- a/drivers/serial/uart_nuvoton.c +++ b/drivers/serial/uart_nuvoton.c @@ -16,7 +16,7 @@ ((const struct uart_numicro_config * const)(dev)->config) #define DRV_DATA(dev) \ - ((struct uart_numicro_data * const)(dev)->driver_data) + ((struct uart_numicro_data * const)(dev)->data) #define UART_STRUCT(dev) \ ((UART_T *)(DEV_CFG(dev))->devcfg.base) diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c index 0581afb117b..827ae9d22d9 100644 --- a/drivers/serial/uart_pl011.c +++ b/drivers/serial/uart_pl011.c @@ -143,7 +143,7 @@ struct pl011_data { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct pl011_data *)(dev)->driver_data) + ((struct pl011_data *)(dev)->data) #define PL011_REGS(dev) \ ((volatile struct pl011_regs *)(DEV_CFG(dev))->base) diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c index f336ffae382..72dfa5a0da0 100644 --- a/drivers/serial/uart_rv32m1_lpuart.c +++ b/drivers/serial/uart_rv32m1_lpuart.c @@ -218,7 +218,7 @@ static void rv32m1_lpuart_irq_callback_set(struct device *dev, uart_irq_callback_user_data_t cb, void *cb_data) { - struct rv32m1_lpuart_data *data = dev->driver_data; + struct rv32m1_lpuart_data *data = dev->data; data->callback = cb; data->cb_data = cb_data; @@ -227,7 +227,7 @@ static void rv32m1_lpuart_irq_callback_set(struct device *dev, static void rv32m1_lpuart_isr(void *arg) { struct device *dev = arg; - struct rv32m1_lpuart_data *data = dev->driver_data; + struct rv32m1_lpuart_data *data = dev->data; if (data->callback) { data->callback(dev, data->cb_data); diff --git a/drivers/serial/uart_sam.c b/drivers/serial/uart_sam.c index 88e07264047..329bed88c3d 100644 --- a/drivers/serial/uart_sam.c +++ b/drivers/serial/uart_sam.c @@ -46,7 +46,7 @@ struct uart_sam_dev_data { #define DEV_CFG(dev) \ ((const struct uart_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_sam_dev_data *const)(dev)->driver_data) + ((struct uart_sam_dev_data *const)(dev)->data) static int baudrate_set(Uart *const uart, uint32_t baudrate, diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c index 1215a74da3b..0fc3faca64c 100644 --- a/drivers/serial/uart_sam0.c +++ b/drivers/serial/uart_sam0.c @@ -79,7 +79,7 @@ struct uart_sam0_dev_data { #define DEV_CFG(dev) \ ((const struct uart_sam0_dev_cfg *const)(dev)->config) -#define DEV_DATA(dev) ((struct uart_sam0_dev_data * const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct uart_sam0_dev_data * const)(dev)->data) static void wait_synchronization(SercomUsart *const usart) { diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c index d5c1fdd8ad6..6920009e768 100644 --- a/drivers/serial/uart_sifive.c +++ b/drivers/serial/uart_sifive.c @@ -70,7 +70,7 @@ struct uart_sifive_data { #define DEV_UART(dev) \ ((struct uart_sifive_regs_t *)(DEV_CFG(dev))->port) #define DEV_DATA(dev) \ - ((struct uart_sifive_data * const)(dev)->driver_data) + ((struct uart_sifive_data * const)(dev)->data) /** * @brief Output a character in polled mode. diff --git a/drivers/serial/uart_stellaris.c b/drivers/serial/uart_stellaris.c index 22742737180..23a5e6cabeb 100644 --- a/drivers/serial/uart_stellaris.c +++ b/drivers/serial/uart_stellaris.c @@ -82,7 +82,7 @@ struct uart_stellaris_dev_data_t { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_stellaris_dev_data_t * const)(dev)->driver_data) + ((struct uart_stellaris_dev_data_t * const)(dev)->data) #define UART_STRUCT(dev) \ ((volatile struct _uart *)(DEV_CFG(dev))->base) diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index 47c05bdba70..3635b70984f 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -36,7 +36,7 @@ LOG_MODULE_REGISTER(uart_stm32); #define DEV_CFG(dev) \ ((const struct uart_stm32_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_stm32_data * const)(dev)->driver_data) + ((struct uart_stm32_data * const)(dev)->data) #define UART_STRUCT(dev) \ ((USART_TypeDef *)(DEV_CFG(dev))->uconf.base) diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c index 2ad22814abc..b709fa976b4 100644 --- a/drivers/serial/uart_xlnx_ps.c +++ b/drivers/serial/uart_xlnx_ps.c @@ -154,7 +154,7 @@ struct uart_xlnx_ps_dev_data_t { ((const struct uart_xlnx_ps_dev_config * const) \ (dev)->config) #define DEV_DATA(dev) \ - ((struct uart_xlnx_ps_dev_data_t *)(dev)->driver_data) + ((struct uart_xlnx_ps_dev_data_t *)(dev)->data) static const struct uart_driver_api uart_xlnx_ps_driver_api; diff --git a/drivers/serial/uart_xmc4xxx.c b/drivers/serial/uart_xmc4xxx.c index 8331715aec1..ca4535e8702 100644 --- a/drivers/serial/uart_xmc4xxx.c +++ b/drivers/serial/uart_xmc4xxx.c @@ -18,7 +18,7 @@ struct uart_xmc4xxx_data { #define DEV_CFG(dev) \ ((const struct uart_device_config * const)(dev)->config) #define DEV_DATA(dev) \ - ((struct uart_xmc4xxx_data * const)(dev)->driver_data) + ((struct uart_xmc4xxx_data * const)(dev)->data) static int uart_xmc4xxx_poll_in(struct device *dev, unsigned char *c) { diff --git a/drivers/serial/usart_sam.c b/drivers/serial/usart_sam.c index 13565f29187..41941f95fa1 100644 --- a/drivers/serial/usart_sam.c +++ b/drivers/serial/usart_sam.c @@ -46,7 +46,7 @@ struct usart_sam_dev_data { #define DEV_CFG(dev) \ ((const struct usart_sam_dev_cfg *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct usart_sam_dev_data *const)(dev)->driver_data) + ((struct usart_sam_dev_data *const)(dev)->data) static int baudrate_set(Usart *const usart, uint32_t baudrate, diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index e953683b31b..7185f099c5e 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -41,7 +41,7 @@ struct spi_cc13xx_cc26xx_data { static inline struct spi_cc13xx_cc26xx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct spi_cc13xx_cc26xx_config * diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index a51ef993b29..174aa84f312 100644 --- a/drivers/spi/spi_dw.c +++ b/drivers/spi/spi_dw.c @@ -56,7 +56,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; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; if (error) { goto out; @@ -88,7 +88,7 @@ out: static void push_data(struct device *dev) { const struct spi_dw_config *info = dev->config; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; uint32_t data = 0U; uint32_t f_tx; @@ -157,7 +157,7 @@ static void push_data(struct device *dev) static void pull_data(struct device *dev) { const struct spi_dw_config *info = dev->config; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; DBG_COUNTER_INIT(); @@ -337,7 +337,7 @@ static int transceive(struct device *dev, struct k_poll_signal *signal) { const struct spi_dw_config *info = dev->config; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; uint32_t tmod = DW_SPI_CTRLR0_TMOD_TX_RX; uint32_t reg_data; int ret; @@ -465,7 +465,7 @@ static int spi_dw_transceive_async(struct device *dev, static int spi_dw_release(struct device *dev, const struct spi_config *config) { - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; if (!spi_context_configured(&spi->ctx, config)) { return -EINVAL; @@ -518,7 +518,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; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; clock_config(dev); clock_on(dev); diff --git a/drivers/spi/spi_dw.h b/drivers/spi/spi_dw.h index c44e72b5070..a381502271f 100644 --- a/drivers/spi/spi_dw.h +++ b/drivers/spi/spi_dw.h @@ -232,7 +232,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; - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; if (!info->clock_name || strlen(info->clock_name) == 0) { spi->clock = NULL; @@ -249,7 +249,7 @@ static inline int clock_config(struct device *dev) static inline void clock_on(struct device *dev) { - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; if (spi->clock) { const struct spi_dw_config *info = dev->config; @@ -262,7 +262,7 @@ static inline void clock_on(struct device *dev) static inline void clock_off(struct device *dev) { - struct spi_dw_data *spi = dev->driver_data; + struct spi_dw_data *spi = dev->data; if (spi->clock) { const struct spi_dw_config *info = dev->config; diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c index bea11e03329..7c27f65b3e8 100644 --- a/drivers/spi/spi_gecko.c +++ b/drivers/spi/spi_gecko.c @@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(spi_gecko); #define SPI_WORD_SIZE 8 -#define DEV_DATA(dev) ((struct spi_gecko_data *) ((dev)->driver_data)) +#define DEV_DATA(dev) ((struct spi_gecko_data *) ((dev)->data)) /* Structure Declarations */ diff --git a/drivers/spi/spi_litespi.h b/drivers/spi/spi_litespi.h index 8f9d4ea91f6..5eeae30bfb0 100644 --- a/drivers/spi/spi_litespi.h +++ b/drivers/spi/spi_litespi.h @@ -27,7 +27,7 @@ #define SPI_ENABLE 0x1 -#define SPI_DATA(dev) ((struct spi_litespi_data *) ((dev)->driver_data)) +#define SPI_DATA(dev) ((struct spi_litespi_data *) ((dev)->data)) /* Structure Declarations */ diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c index 671532af1da..5f72d681dd7 100644 --- a/drivers/spi/spi_ll_stm32.c +++ b/drivers/spi/spi_ll_stm32.c @@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(spi_ll_stm32); (const struct spi_stm32_config * const)(dev->config) #define DEV_DATA(dev) \ -(struct spi_stm32_data * const)(dev->driver_data) +(struct spi_stm32_data * const)(dev->data) /* * Check for SPI_SR_FRE to determine support for TI mode frame format @@ -412,7 +412,7 @@ static void spi_stm32_isr(void *arg) { struct device * const dev = (struct device *) arg; const struct spi_stm32_config *cfg = dev->config; - struct spi_stm32_data *data = dev->driver_data; + struct spi_stm32_data *data = dev->data; SPI_TypeDef *spi = cfg->spi; int err; @@ -791,7 +791,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; + struct spi_stm32_data *data __attribute__((unused)) = dev->data; 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 e22b4efb961..4d76a69b7da 100644 --- a/drivers/spi/spi_mcux_dspi.c +++ b/drivers/spi/spi_mcux_dspi.c @@ -37,7 +37,7 @@ struct spi_mcux_data { static int spi_mcux_transfer_next_packet(struct device *dev) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; dspi_transfer_t transfer; @@ -107,7 +107,7 @@ static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; DSPI_MasterTransferHandleIRQ(base, &data->handle); @@ -117,7 +117,7 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, dspi_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); spi_context_update_rx(&data->ctx, 1, data->transfer_len); @@ -129,7 +129,7 @@ static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; dspi_master_config_t master_config; struct device *clock_dev; @@ -211,7 +211,7 @@ static int transceive(struct device *dev, bool asynchronous, struct k_poll_signal *signal) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; int ret; spi_context_lock(&data->ctx, asynchronous, signal); @@ -259,7 +259,7 @@ static int spi_mcux_transceive_async(struct device *dev, static int spi_mcux_release(struct device *dev, const struct spi_config *spi_cfg) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -269,7 +269,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; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c index ff58329ec31..6bd9a44c2d6 100644 --- a/drivers/spi/spi_mcux_flexcomm.c +++ b/drivers/spi/spi_mcux_flexcomm.c @@ -33,7 +33,7 @@ struct spi_mcux_data { static void spi_mcux_transfer_next_packet(struct device *dev) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; spi_transfer_t transfer; @@ -96,7 +96,7 @@ static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; SPI_MasterTransferHandleIRQ(base, &data->handle); @@ -106,7 +106,7 @@ static void spi_mcux_master_transfer_callback(SPI_Type *base, spi_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); spi_context_update_rx(&data->ctx, 1, data->transfer_len); @@ -118,7 +118,7 @@ static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; SPI_Type *base = config->base; spi_master_config_t master_config; uint32_t clock_freq; @@ -191,7 +191,7 @@ static int transceive(struct device *dev, bool asynchronous, struct k_poll_signal *signal) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; int ret; spi_context_lock(&data->ctx, asynchronous, signal); @@ -236,7 +236,7 @@ static int spi_mcux_transceive_async(struct device *dev, static int spi_mcux_release(struct device *dev, const struct spi_config *spi_cfg) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -246,7 +246,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; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c index da4e0350b2f..664696b93f8 100644 --- a/drivers/spi/spi_mcux_lpspi.c +++ b/drivers/spi/spi_mcux_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; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; lpspi_transfer_t transfer; @@ -107,7 +107,7 @@ static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; LPSPI_MasterTransferHandleIRQ(base, &data->handle); @@ -117,7 +117,7 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, lpspi_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); spi_context_update_rx(&data->ctx, 1, data->transfer_len); @@ -129,7 +129,7 @@ static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; struct device *clock_dev; @@ -210,7 +210,7 @@ static int transceive(struct device *dev, bool asynchronous, struct k_poll_signal *signal) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; int ret; spi_context_lock(&data->ctx, asynchronous, signal); @@ -255,7 +255,7 @@ static int spi_mcux_transceive_async(struct device *dev, static int spi_mcux_release(struct device *dev, const struct spi_config *spi_cfg) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -265,7 +265,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; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; config->irq_config_func(dev); diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index 33474d024cc..835e82cf40e 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -30,7 +30,7 @@ struct spi_nrfx_config { static inline struct spi_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index 7da70200432..15e88605a6f 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -35,7 +35,7 @@ struct spi_nrfx_config { static inline struct spi_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c index cc65f1f6492..ac9e16f2587 100644 --- a/drivers/spi/spi_nrfx_spis.c +++ b/drivers/spi/spi_nrfx_spis.c @@ -25,7 +25,7 @@ struct spi_nrfx_config { static inline struct spi_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct spi_nrfx_config *get_dev_config(struct device *dev) diff --git a/drivers/spi/spi_oc_simple.h b/drivers/spi/spi_oc_simple.h index 8f382fae7d4..e4204818937 100644 --- a/drivers/spi/spi_oc_simple.h +++ b/drivers/spi/spi_oc_simple.h @@ -7,7 +7,7 @@ #include "spi_context.h" #define SPI_OC_SIMPLE_DATA(dev) \ - ((struct spi_oc_simple_data *) ((dev)->driver_data)) + ((struct spi_oc_simple_data *) ((dev)->data)) #define SPI_OC_SIMPLE_REG(info, offset) \ ((mem_addr_t) (info->base + \ diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c index f60415b78b6..681e56e6405 100644 --- a/drivers/spi/spi_rv32m1_lpspi.c +++ b/drivers/spi/spi_rv32m1_lpspi.c @@ -40,7 +40,7 @@ struct spi_mcux_data { static void spi_mcux_transfer_next_packet(struct device *dev) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; struct spi_context *ctx = &data->ctx; lpspi_transfer_t transfer; @@ -107,7 +107,7 @@ static void spi_mcux_isr(void *arg) { struct device *dev = (struct device *)arg; const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; LPSPI_MasterTransferHandleIRQ(base, &data->handle); @@ -117,7 +117,7 @@ static void spi_mcux_master_transfer_callback(LPSPI_Type *base, lpspi_master_handle_t *handle, status_t status, void *userData) { struct device *dev = userData; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_update_tx(&data->ctx, 1, data->transfer_len); spi_context_update_rx(&data->ctx, 1, data->transfer_len); @@ -129,7 +129,7 @@ static int spi_mcux_configure(struct device *dev, const struct spi_config *spi_cfg) { const struct spi_mcux_config *config = dev->config; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; LPSPI_Type *base = config->base; lpspi_master_config_t master_config; struct device *clock_dev; @@ -206,7 +206,7 @@ static int transceive(struct device *dev, bool asynchronous, struct k_poll_signal *signal) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; int ret; spi_context_lock(&data->ctx, asynchronous, signal); @@ -251,7 +251,7 @@ static int spi_mcux_transceive_async(struct device *dev, static int spi_mcux_release(struct device *dev, const struct spi_config *spi_cfg) { - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -261,7 +261,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; - struct spi_mcux_data *data = dev->driver_data; + struct spi_mcux_data *data = dev->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 47ee2a43ef1..54f0f0e3c9e 100644 --- a/drivers/spi/spi_sam.c +++ b/drivers/spi/spi_sam.c @@ -52,7 +52,7 @@ static int spi_sam_configure(struct device *dev, const struct spi_config *config) { const struct spi_sam_config *cfg = dev->config; - struct spi_sam_data *data = dev->driver_data; + struct spi_sam_data *data = dev->data; Spi *regs = cfg->regs; uint32_t spi_mr = 0U, spi_csr = 0U; int div; @@ -362,7 +362,7 @@ static int spi_sam_transceive(struct device *dev, const struct spi_buf_set *rx_bufs) { const struct spi_sam_config *cfg = dev->config; - struct spi_sam_data *data = dev->driver_data; + struct spi_sam_data *data = dev->data; Spi *regs = cfg->regs; int err; @@ -420,7 +420,7 @@ static int spi_sam_transceive_async(struct device *dev, static int spi_sam_release(struct device *dev, const struct spi_config *config) { - struct spi_sam_data *data = dev->driver_data; + struct spi_sam_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -430,7 +430,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; - struct spi_sam_data *data = dev->driver_data; + struct spi_sam_data *data = dev->data; soc_pmc_peripheral_enable(cfg->periph_id); diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c index c7b94ea8d73..71cb903c600 100644 --- a/drivers/spi/spi_sam0.c +++ b/drivers/spi/spi_sam0.c @@ -69,7 +69,7 @@ static int spi_sam0_configure(struct device *dev, const struct spi_config *config) { const struct spi_sam0_config *cfg = dev->config; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; SercomSpi *regs = cfg->regs; SERCOM_SPI_CTRLA_Type ctrla = {.reg = 0}; SERCOM_SPI_CTRLB_Type ctrlb = {.reg = 0}; @@ -391,7 +391,7 @@ static int spi_sam0_transceive(struct device *dev, const struct spi_buf_set *rx_bufs) { const struct spi_sam0_config *cfg = dev->config; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; SercomSpi *regs = cfg->regs; int err; @@ -443,7 +443,7 @@ static int spi_sam0_dma_rx_load(struct device *dev, uint8_t *buf, size_t len) { const struct spi_sam0_config *cfg = dev->config; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; SercomSpi *regs = cfg->regs; struct dma_config dma_cfg = { 0 }; struct dma_block_config dma_blk = { 0 }; @@ -485,7 +485,7 @@ 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; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; SercomSpi *regs = cfg->regs; struct dma_config dma_cfg = { 0 }; struct dma_block_config dma_blk = { 0 }; @@ -524,7 +524,7 @@ static int spi_sam0_dma_tx_load(struct device *dev, const uint8_t *buf, static bool spi_sam0_dma_advance_segment(struct device *dev) { - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; uint32_t segment_len; /* Pick the shorter buffer of ones that have an actual length */ @@ -549,7 +549,7 @@ static bool spi_sam0_dma_advance_segment(struct device *dev) static int spi_sam0_dma_advance_buffers(struct device *dev) { - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; int retval; if (data->dma_segment_len == 0) { @@ -588,7 +588,7 @@ static void spi_sam0_dma_rx_done(struct device *dma_dev, void *arg, { struct device *dev = arg; const struct spi_sam0_config *cfg = dev->config; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; int retval; ARG_UNUSED(id); @@ -622,7 +622,7 @@ static int spi_sam0_transceive_async(struct device *dev, struct k_poll_signal *async) { const struct spi_sam0_config *cfg = dev->config; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; int retval; if (!data->dma) { @@ -671,7 +671,7 @@ err_unlock: static int spi_sam0_release(struct device *dev, const struct spi_config *config) { - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; spi_context_unlock_unconditionally(&data->ctx); @@ -681,7 +681,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; - struct spi_sam0_data *data = dev->driver_data; + struct spi_sam0_data *data = dev->data; SercomSpi *regs = cfg->regs; #ifdef MCLK diff --git a/drivers/spi/spi_sifive.h b/drivers/spi/spi_sifive.h index 4905e55e924..3b0ffc3eef7 100644 --- a/drivers/spi/spi_sifive.h +++ b/drivers/spi/spi_sifive.h @@ -14,7 +14,7 @@ #include #define SPI_CFG(dev) ((struct spi_sifive_cfg *) ((dev)->config)) -#define SPI_DATA(dev) ((struct spi_sifive_data *) ((dev)->driver_data)) +#define SPI_DATA(dev) ((struct spi_sifive_data *) ((dev)->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 2bbda316a94..3b9eacd8bc0 100644 --- a/drivers/spi/spi_xec_qmspi.c +++ b/drivers/spi/spi_xec_qmspi.c @@ -169,7 +169,7 @@ static int qmspi_configure(struct device *dev, const struct spi_config *config) { const struct spi_qmspi_config *cfg = dev->config; - struct spi_qmspi_data *data = dev->driver_data; + struct spi_qmspi_data *data = dev->data; QMSPI_Type *regs = cfg->regs; uint32_t smode; @@ -509,7 +509,7 @@ static int qmspi_transceive(struct device *dev, const struct spi_buf_set *rx_bufs) { const struct spi_qmspi_config *cfg = dev->config; - struct spi_qmspi_data *data = dev->driver_data; + struct spi_qmspi_data *data = dev->data; QMSPI_Type *regs = cfg->regs; const struct spi_buf *ptx; const struct spi_buf *prx; @@ -592,7 +592,7 @@ static int qmspi_transceive_async(struct device *dev, static int qmspi_release(struct device *dev, const struct spi_config *config) { - struct spi_qmspi_data *data = dev->driver_data; + struct spi_qmspi_data *data = dev->data; const struct spi_qmspi_config *cfg = dev->config; QMSPI_Type *regs = cfg->regs; @@ -617,7 +617,7 @@ static int qmspi_release(struct device *dev, static int qmspi_init(struct device *dev) { const struct spi_qmspi_config *cfg = dev->config; - struct spi_qmspi_data *data = dev->driver_data; + struct spi_qmspi_data *data = dev->data; QMSPI_Type *regs = cfg->regs; mchp_pcr_periph_slp_ctrl(PCR_QMSPI, MCHP_PCR_SLEEP_DIS); diff --git a/drivers/video/mt9m114.c b/drivers/video/mt9m114.c index f738c4bc748..d4a5df746b3 100644 --- a/drivers/video/mt9m114.c +++ b/drivers/video/mt9m114.c @@ -135,7 +135,7 @@ static inline int i2c_burst_write16(struct device *dev, uint16_t dev_addr, static int mt9m114_write_reg(struct device *dev, uint16_t reg_addr, uint8_t reg_size, void *value) { - struct mt9m114_data *drv_data = dev->driver_data; + struct mt9m114_data *drv_data = dev->data; switch (reg_size) { case 2: @@ -157,7 +157,7 @@ static int mt9m114_write_reg(struct device *dev, uint16_t reg_addr, uint8_t reg_ static int mt9m114_read_reg(struct device *dev, uint16_t reg_addr, uint8_t reg_size, void *value) { - struct mt9m114_data *drv_data = dev->driver_data; + struct mt9m114_data *drv_data = dev->data; int err; if (reg_size > 4) { @@ -257,7 +257,7 @@ static int mt9m114_set_state(struct device *dev, uint8_t state) static int mt9m114_set_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - struct mt9m114_data *drv_data = dev->driver_data; + struct mt9m114_data *drv_data = dev->data; uint16_t output_format; int ret; @@ -299,7 +299,7 @@ static int mt9m114_set_fmt(struct device *dev, enum video_endpoint_id ep, static int mt9m114_get_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - struct mt9m114_data *drv_data = dev->driver_data; + struct mt9m114_data *drv_data = dev->data; *fmt = drv_data->fmt; @@ -388,7 +388,7 @@ static struct mt9m114_data mt9m114_data_0; static int mt9m114_init_0(struct device *dev) { - struct mt9m114_data *drv_data = dev->driver_data; + struct mt9m114_data *drv_data = dev->data; drv_data->i2c = device_get_binding(DT_INST_BUS_LABEL(0)); if (drv_data->i2c == NULL) { diff --git a/drivers/video/video_mcux_csi.c b/drivers/video/video_mcux_csi.c index 7474f7fb744..93c8476f71d 100644 --- a/drivers/video/video_mcux_csi.c +++ b/drivers/video/video_mcux_csi.c @@ -51,7 +51,7 @@ static void __frame_done_cb(CSI_Type *base, csi_handle_t *handle, { struct device *dev = user_data; const struct video_mcux_csi_config *config = dev->config; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; enum video_signal_result result = VIDEO_BUF_DONE; struct video_buffer *vbuf, *vbuf_first = NULL; uint32_t buffer_addr; @@ -116,7 +116,7 @@ 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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; unsigned int bpp = video_pix_fmt_bpp(fmt->pixelformat); status_t ret; @@ -155,7 +155,7 @@ static int video_mcux_csi_set_fmt(struct device *dev, enum video_endpoint_id ep, static int video_mcux_csi_get_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; if (fmt == NULL || ep != VIDEO_EP_OUT) { return -EINVAL; @@ -177,7 +177,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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; status_t ret; ret = CSI_TransferStart(config->base, &data->csi_handle); @@ -195,7 +195,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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; status_t ret; if (data->sensor_dev && video_stream_stop(data->sensor_dev)) { @@ -215,7 +215,7 @@ 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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; struct video_buf *vbuf; uint32_t buffer_addr; status_t ret; @@ -249,7 +249,7 @@ 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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; unsigned int to_read; status_t ret; @@ -275,7 +275,7 @@ static int video_mcux_csi_dequeue(struct device *dev, enum video_endpoint_id ep, struct video_buffer **vbuf, k_timeout_t timeout) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; if (ep != VIDEO_EP_OUT) { return -EINVAL; @@ -292,7 +292,7 @@ static int video_mcux_csi_dequeue(struct device *dev, enum video_endpoint_id ep, static inline int video_mcux_csi_set_ctrl(struct device *dev, unsigned int cid, void *value) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; int ret = -ENOTSUP; /* Forward to sensor dev if any */ @@ -306,7 +306,7 @@ static inline int video_mcux_csi_set_ctrl(struct device *dev, unsigned int cid, static inline int video_mcux_csi_get_ctrl(struct device *dev, unsigned int cid, void *value) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; int ret = -ENOTSUP; /* Forward to sensor dev if any */ @@ -321,7 +321,7 @@ static int video_mcux_csi_get_caps(struct device *dev, enum video_endpoint_id ep, struct video_caps *caps) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; int err = -ENODEV; if (ep != VIDEO_EP_OUT) { @@ -350,7 +350,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; - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; k_fifo_init(&data->fifo_in); k_fifo_init(&data->fifo_out); @@ -373,7 +373,7 @@ static int video_mcux_csi_set_signal(struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal) { - struct video_mcux_csi_data *data = dev->driver_data; + struct video_mcux_csi_data *data = dev->data; if (data->signal && signal != NULL) { return -EALREADY; diff --git a/drivers/video/video_sw_generator.c b/drivers/video/video_sw_generator.c index 447505fa032..976fd2474d3 100644 --- a/drivers/video/video_sw_generator.c +++ b/drivers/video/video_sw_generator.c @@ -26,7 +26,7 @@ static int video_sw_generator_set_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; if (ep != VIDEO_EP_OUT) { return -EINVAL; @@ -41,7 +41,7 @@ static int video_sw_generator_get_fmt(struct device *dev, enum video_endpoint_id ep, struct video_format *fmt) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; if (ep != VIDEO_EP_OUT) { return -EINVAL; @@ -54,14 +54,14 @@ static int video_sw_generator_get_fmt(struct device *dev, static int video_sw_generator_stream_start(struct device *dev) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; return k_delayed_work_submit(&data->buf_work, K_MSEC(33)); } static int video_sw_generator_stream_stop(struct device *dev) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; k_delayed_work_cancel(&data->buf_work); @@ -127,7 +127,7 @@ static int video_sw_generator_enqueue(struct device *dev, enum video_endpoint_id ep, struct video_buffer *vbuf) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; if (ep != VIDEO_EP_OUT) { return -EINVAL; @@ -143,7 +143,7 @@ static int video_sw_generator_dequeue(struct device *dev, struct video_buffer **vbuf, k_timeout_t timeout) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; if (ep != VIDEO_EP_OUT) { return -EINVAL; @@ -161,7 +161,7 @@ static int video_sw_generator_flush(struct device *dev, enum video_endpoint_id ep, bool cancel) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; struct video_buffer *vbuf; if (!cancel) { @@ -210,7 +210,7 @@ static int video_sw_generator_set_signal(struct device *dev, enum video_endpoint_id ep, struct k_poll_signal *signal) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; if (data->signal && signal != NULL) { return -EALREADY; @@ -226,7 +226,7 @@ static inline int video_sw_generator_set_ctrl(struct device *dev, unsigned int cid, void *value) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; switch (cid) { case VIDEO_CID_VFLIP: @@ -263,7 +263,7 @@ static struct video_sw_generator_data video_sw_generator_data_0 = { static int video_sw_generator_init(struct device *dev) { - struct video_sw_generator_data *data = dev->driver_data; + struct video_sw_generator_data *data = dev->data; data->dev = dev; k_fifo_init(&data->fifo_in); diff --git a/drivers/watchdog/wdt_esp32.c b/drivers/watchdog/wdt_esp32.c index 0cd481aa5ec..a5b05772e9f 100644 --- a/drivers/watchdog/wdt_esp32.c +++ b/drivers/watchdog/wdt_esp32.c @@ -60,7 +60,7 @@ struct wdt_esp32_config { #define DEV_CFG(dev) \ ((const struct wdt_esp32_config *const)(dev)->config) #define DEV_DATA(dev) \ - ((struct wdt_esp32_data *)(dev)->driver_data) + ((struct wdt_esp32_data *)(dev)->data) #define DEV_BASE(dev) \ ((volatile struct wdt_esp32_regs_t *)(DEV_CFG(dev))->base) diff --git a/drivers/watchdog/wdt_gecko.c b/drivers/watchdog/wdt_gecko.c index 038a22a442c..f480b03643e 100644 --- a/drivers/watchdog/wdt_gecko.c +++ b/drivers/watchdog/wdt_gecko.c @@ -42,7 +42,7 @@ struct wdt_gecko_data { #define DEV_NAME(dev) ((dev)->name) #define DEV_DATA(dev) \ - ((struct wdt_gecko_data *)(dev)->driver_data) + ((struct wdt_gecko_data *)(dev)->data) #define DEV_CFG(dev) \ ((const struct wdt_gecko_cfg *)(dev)->config) diff --git a/drivers/watchdog/wdt_iwdg_stm32.h b/drivers/watchdog/wdt_iwdg_stm32.h index 1a620c62fff..64e91cfa63c 100644 --- a/drivers/watchdog/wdt_iwdg_stm32.h +++ b/drivers/watchdog/wdt_iwdg_stm32.h @@ -27,7 +27,7 @@ struct iwdg_stm32_data { }; #define IWDG_STM32_DATA(dev) \ - ((struct iwdg_stm32_data * const)(dev)->driver_data) + ((struct iwdg_stm32_data * const)(dev)->data) #define IWDG_STM32_STRUCT(dev) \ ((IWDG_TypeDef *)(IWDG_STM32_DATA(dev))->Instance) diff --git a/drivers/watchdog/wdt_mchp_xec.c b/drivers/watchdog/wdt_mchp_xec.c index f63ab264c55..67f914298f6 100644 --- a/drivers/watchdog/wdt_mchp_xec.c +++ b/drivers/watchdog/wdt_mchp_xec.c @@ -31,7 +31,7 @@ DEVICE_DECLARE(wdt_xec); static int wdt_xec_setup(struct device *dev, uint8_t options) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; - struct wdt_xec_data *data = dev->driver_data; + struct wdt_xec_data *data = dev->data; if (wdt_regs->CTRL & MCHP_WDT_CTRL_EN) { return -EBUSY; @@ -63,7 +63,7 @@ static int wdt_xec_setup(struct device *dev, uint8_t options) static int wdt_xec_disable(struct device *dev) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; - struct wdt_xec_data *data = dev->driver_data; + struct wdt_xec_data *data = dev->data; if (!(wdt_regs->CTRL & MCHP_WDT_CTRL_EN)) { return -EALREADY; @@ -81,7 +81,7 @@ static int wdt_xec_install_timeout(struct device *dev, const struct wdt_timeout_cfg *config) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; - struct wdt_xec_data *data = dev->driver_data; + struct wdt_xec_data *data = dev->data; if (wdt_regs->CTRL & MCHP_WDT_CTRL_EN) { return -EBUSY; @@ -142,7 +142,7 @@ static int wdt_xec_feed(struct device *dev, int channel_id) static void wdt_xec_isr(struct device *dev) { WDT_Type *wdt_regs = WDT_XEC_REG_BASE; - struct wdt_xec_data *data = dev->driver_data; + struct wdt_xec_data *data = dev->data; LOG_DBG("WDT ISR"); diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c index f1e2cbf6029..8e9e465d330 100644 --- a/drivers/watchdog/wdt_mcux_wdog.c +++ b/drivers/watchdog/wdt_mcux_wdog.c @@ -33,7 +33,7 @@ struct mcux_wdog_data { static int mcux_wdog_setup(struct device *dev, uint8_t options) { const struct mcux_wdog_config *config = dev->config; - struct mcux_wdog_data *data = dev->driver_data; + struct mcux_wdog_data *data = dev->data; WDOG_Type *base = config->base; if (!data->timeout_valid) { @@ -56,7 +56,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; - struct mcux_wdog_data *data = dev->driver_data; + struct mcux_wdog_data *data = dev->data; WDOG_Type *base = config->base; WDOG_Deinit(base); @@ -70,7 +70,7 @@ static int mcux_wdog_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct mcux_wdog_config *config = dev->config; - struct mcux_wdog_data *data = dev->driver_data; + struct mcux_wdog_data *data = dev->data; struct device *clock_dev; uint32_t clock_freq; @@ -136,7 +136,7 @@ static void mcux_wdog_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_wdog_config *config = dev->config; - struct mcux_wdog_data *data = dev->driver_data; + struct mcux_wdog_data *data = dev->data; WDOG_Type *base = config->base; uint32_t flags; diff --git a/drivers/watchdog/wdt_mcux_wdog32.c b/drivers/watchdog/wdt_mcux_wdog32.c index 56cf5ca4b57..212d3276ee2 100644 --- a/drivers/watchdog/wdt_mcux_wdog32.c +++ b/drivers/watchdog/wdt_mcux_wdog32.c @@ -41,7 +41,7 @@ struct mcux_wdog32_data { static int mcux_wdog32_setup(struct device *dev, uint8_t options) { const struct mcux_wdog32_config *config = dev->config; - struct mcux_wdog32_data *data = dev->driver_data; + struct mcux_wdog32_data *data = dev->data; WDOG_Type *base = config->base; if (!data->timeout_valid) { @@ -64,7 +64,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; - struct mcux_wdog32_data *data = dev->driver_data; + struct mcux_wdog32_data *data = dev->data; WDOG_Type *base = config->base; WDOG32_Deinit(base); @@ -81,7 +81,7 @@ static int mcux_wdog32_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct mcux_wdog32_config *config = dev->config; - struct mcux_wdog32_data *data = dev->driver_data; + struct mcux_wdog32_data *data = dev->data; uint32_t clock_freq; int div; @@ -157,7 +157,7 @@ static void mcux_wdog32_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_wdog32_config *config = dev->config; - struct mcux_wdog32_data *data = dev->driver_data; + struct mcux_wdog32_data *data = dev->data; WDOG_Type *base = config->base; uint32_t flags; diff --git a/drivers/watchdog/wdt_mcux_wwdt.c b/drivers/watchdog/wdt_mcux_wwdt.c index 7b319605bd9..1f1a3682747 100644 --- a/drivers/watchdog/wdt_mcux_wwdt.c +++ b/drivers/watchdog/wdt_mcux_wwdt.c @@ -35,7 +35,7 @@ struct mcux_wwdt_data { static int mcux_wwdt_setup(struct device *dev, uint8_t options) { const struct mcux_wwdt_config *config = dev->config; - struct mcux_wwdt_data *data = dev->driver_data; + struct mcux_wwdt_data *data = dev->data; WWDT_Type *base = config->base; if (!data->timeout_valid) { @@ -52,7 +52,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; - struct mcux_wwdt_data *data = dev->driver_data; + struct mcux_wwdt_data *data = dev->data; WWDT_Type *base = config->base; WWDT_Deinit(base); @@ -73,7 +73,7 @@ static int mcux_wwdt_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct mcux_wwdt_config *config = dev->config; - struct mcux_wwdt_data *data = dev->driver_data; + struct mcux_wwdt_data *data = dev->data; uint32_t clock_freq; if (data->timeout_valid) { @@ -135,7 +135,7 @@ static void mcux_wwdt_isr(void *arg) { struct device *dev = (struct device *)arg; const struct mcux_wwdt_config *config = dev->config; - struct mcux_wwdt_data *data = dev->driver_data; + struct mcux_wwdt_data *data = dev->data; WWDT_Type *base = config->base; uint32_t flags; diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c index 125415388a4..5bd8867830d 100644 --- a/drivers/watchdog/wdt_nrfx.c +++ b/drivers/watchdog/wdt_nrfx.c @@ -24,7 +24,7 @@ struct wdt_nrfx_config { static inline struct wdt_nrfx_data *get_dev_data(struct device *dev) { - return dev->driver_data; + return dev->data; } static inline const struct wdt_nrfx_config *get_dev_config(struct device *dev) diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c index d47b2f99120..ab8515c4200 100644 --- a/drivers/watchdog/wdt_sam.c +++ b/drivers/watchdog/wdt_sam.c @@ -52,7 +52,7 @@ static void wdt_sam_isr(struct device *dev) { uint32_t wdt_sr; Wdt *const wdt = DEV_CFG(dev)->regs; - struct wdt_sam_dev_data *data = dev->driver_data; + struct wdt_sam_dev_data *data = dev->data; /* Clear status bit to acknowledge interrupt by dummy read. */ wdt_sr = wdt->WDT_SR; @@ -86,7 +86,7 @@ int wdt_sam_convert_timeout(uint32_t timeout, uint32_t sclk) static int wdt_sam_disable(struct device *dev) { Wdt *const wdt = DEV_CFG(dev)->regs; - struct wdt_sam_dev_data *data = dev->driver_data; + struct wdt_sam_dev_data *data = dev->data; /* since Watchdog mode register is 'write-once', we can't disable if * someone has already set the mode register @@ -110,7 +110,7 @@ static int wdt_sam_setup(struct device *dev, uint8_t options) { Wdt *const wdt = DEV_CFG(dev)->regs; - struct wdt_sam_dev_data *data = dev->driver_data; + struct wdt_sam_dev_data *data = dev->data; if (!data->timeout_valid) { LOG_ERR("No valid timeouts installed"); @@ -145,7 +145,7 @@ static int wdt_sam_install_timeout(struct device *dev, uint32_t wdt_mode = 0U; int timeout_value; - struct wdt_sam_dev_data *data = dev->driver_data; + struct wdt_sam_dev_data *data = dev->data; if (data->timeout_valid) { LOG_ERR("No more timeouts can be installed"); diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c index 506dff81726..dce69841742 100644 --- a/drivers/watchdog/wdt_sam0.c +++ b/drivers/watchdog/wdt_sam0.c @@ -87,7 +87,7 @@ static uint32_t wdt_sam0_timeout_to_wdt_period(uint32_t timeout_ms) static void wdt_sam0_isr(struct device *dev) { - struct wdt_sam0_dev_data *data = dev->driver_data; + struct wdt_sam0_dev_data *data = dev->data; WDT_REGS->INTFLAG.reg = WDT_INTFLAG_EW; @@ -98,7 +98,7 @@ static void wdt_sam0_isr(struct device *dev) static int wdt_sam0_setup(struct device *dev, uint8_t options) { - struct wdt_sam0_dev_data *data = dev->driver_data; + struct wdt_sam0_dev_data *data = dev->data; if (wdt_sam0_is_enabled()) { LOG_ERR("Watchdog already setup"); @@ -142,7 +142,7 @@ static int wdt_sam0_disable(struct device *dev) static int wdt_sam0_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { - struct wdt_sam0_dev_data *data = dev->driver_data; + struct wdt_sam0_dev_data *data = dev->data; uint32_t window, per; /* CONFIG is enable protected, error out if already enabled */ @@ -227,7 +227,7 @@ timeout_invalid: static int wdt_sam0_feed(struct device *dev, int channel_id) { - struct wdt_sam0_dev_data *data = dev->driver_data; + struct wdt_sam0_dev_data *data = dev->data; if (!data->timeout_valid) { LOG_ERR("No valid timeout installed"); diff --git a/drivers/watchdog/wdt_wwdg_stm32.h b/drivers/watchdog/wdt_wwdg_stm32.h index a809e631cc6..c1cbe66594b 100644 --- a/drivers/watchdog/wdt_wwdg_stm32.h +++ b/drivers/watchdog/wdt_wwdg_stm32.h @@ -40,7 +40,7 @@ struct wwdg_stm32_data { ((const struct wwdg_stm32_config *const)(dev)->config) #define WWDG_STM32_DATA(dev) \ - ((struct wwdg_stm32_data *const)(dev)->driver_data) + ((struct wwdg_stm32_data *const)(dev)->data) #define WWDG_STM32_STRUCT(dev) \ ((WWDG_TypeDef *)(WWDG_STM32_CFG(dev))->Instance) diff --git a/drivers/wifi/esp/esp.c b/drivers/wifi/esp/esp.c index da13257c98b..0343ff9572b 100644 --- a/drivers/wifi/esp/esp.c +++ b/drivers/wifi/esp/esp.c @@ -87,7 +87,7 @@ MODEM_CMD_DEFINE(on_cmd_error) /* RX thread */ static void esp_rx(struct device *dev) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; while (true) { /* wait for incoming data */ @@ -537,7 +537,7 @@ static void esp_mgmt_scan_work(struct k_work *work) static int esp_mgmt_scan(struct device *dev, scan_result_cb_t cb) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; if (data->scan_cb != NULL) { return -EINPROGRESS; @@ -601,7 +601,7 @@ static void esp_mgmt_connect_work(struct k_work *work) static int esp_mgmt_connect(struct device *dev, struct wifi_connect_req_params *params) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; int len; if (!net_if_is_up(data->net_iface)) { @@ -637,7 +637,7 @@ static int esp_mgmt_connect(struct device *dev, static int esp_mgmt_disconnect(struct device *dev) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; int ret; ret = modem_cmd_send(&data->mctx.iface, &data->mctx.cmd_handler, @@ -652,7 +652,7 @@ static int esp_mgmt_ap_enable(struct device *dev, { char cmd[sizeof("AT+"_CWSAP"=\"\",\"\",xx,x") + WIFI_SSID_MAX_LEN + WIFI_PSK_MAX_LEN]; - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; int ecn = 0, len, ret; ret = modem_cmd_send(&data->mctx.iface, &data->mctx.cmd_handler, @@ -688,7 +688,7 @@ static int esp_mgmt_ap_enable(struct device *dev, static int esp_mgmt_ap_disable(struct device *dev) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; int ret; ret = modem_cmd_send(&data->mctx.iface, &data->mctx.cmd_handler, @@ -785,7 +785,7 @@ static void esp_reset(struct esp_data *dev) static void esp_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; net_if_flag_set(iface, NET_IF_NO_AUTO_START); data->net_iface = iface; @@ -804,7 +804,7 @@ static const struct net_wifi_mgmt_offload esp_api = { static int esp_init(struct device *dev) { - struct esp_data *data = dev->driver_data; + struct esp_data *data = dev->data; int ret = 0; k_sem_init(&data->sem_tx_ready, 0, 1); diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c index aac140ba86b..e013cb4ecf5 100644 --- a/drivers/wifi/eswifi/eswifi_core.c +++ b/drivers/wifi/eswifi/eswifi_core.c @@ -412,7 +412,7 @@ static void eswifi_iface_init(struct net_if *iface) static int eswifi_mgmt_scan(struct device *dev, scan_result_cb_t cb) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; LOG_DBG(""); @@ -429,7 +429,7 @@ static int eswifi_mgmt_scan(struct device *dev, scan_result_cb_t cb) static int eswifi_mgmt_disconnect(struct device *dev) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; LOG_DBG(""); @@ -475,7 +475,7 @@ static int __eswifi_sta_config(struct eswifi_dev *eswifi, static int eswifi_mgmt_connect(struct device *dev, struct wifi_connect_req_params *params) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; int err; LOG_DBG(""); @@ -503,7 +503,7 @@ void eswifi_async_msg(struct eswifi_dev *eswifi, char *msg, size_t len) static int eswifi_mgmt_ap_enable(struct device *dev, struct wifi_connect_req_params *params) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; struct net_if_ipv4 *ipv4 = eswifi->iface->config.ip.ipv4; struct net_if_addr *unicast = NULL; int err = -EIO, i; @@ -609,7 +609,7 @@ static int eswifi_mgmt_ap_enable(struct device *dev, static int eswifi_mgmt_ap_disable(struct device *dev) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; char cmd[] = "AE\r"; int err; @@ -630,7 +630,7 @@ static int eswifi_mgmt_ap_disable(struct device *dev) static int eswifi_init(struct device *dev) { - struct eswifi_dev *eswifi = dev->driver_data; + struct eswifi_dev *eswifi = dev->data; LOG_DBG(""); diff --git a/include/audio/codec.h b/include/audio/codec.h index 8b4c896e41c..d8468b0631a 100644 --- a/include/audio/codec.h +++ b/include/audio/codec.h @@ -142,7 +142,7 @@ static inline int audio_codec_configure(struct device *dev, struct audio_codec_cfg *cfg) { const struct audio_codec_api *api = - (const struct audio_codec_api *)dev->driver_api; + (const struct audio_codec_api *)dev->api; return api->configure(dev, cfg); } @@ -159,7 +159,7 @@ static inline int audio_codec_configure(struct device *dev, static inline void audio_codec_start_output(struct device *dev) { const struct audio_codec_api *api = - (const struct audio_codec_api *)dev->driver_api; + (const struct audio_codec_api *)dev->api; api->start_output(dev); } @@ -176,7 +176,7 @@ static inline void audio_codec_start_output(struct device *dev) static inline void audio_codec_stop_output(struct device *dev) { const struct audio_codec_api *api = - (const struct audio_codec_api *)dev->driver_api; + (const struct audio_codec_api *)dev->api; api->stop_output(dev); } @@ -197,7 +197,7 @@ static inline int audio_codec_set_property(struct device *dev, audio_property_t audio_channel_t channel, audio_property_value_t val) { const struct audio_codec_api *api = - (const struct audio_codec_api *)dev->driver_api; + (const struct audio_codec_api *)dev->api; return api->set_property(dev, property, channel, val); } @@ -216,7 +216,7 @@ static inline int audio_codec_set_property(struct device *dev, audio_property_t static inline int audio_codec_apply_properties(struct device *dev) { const struct audio_codec_api *api = - (const struct audio_codec_api *)dev->driver_api; + (const struct audio_codec_api *)dev->api; return api->apply_properties(dev); } diff --git a/include/audio/dmic.h b/include/audio/dmic.h index 9859cd2cb29..f10fef6959e 100644 --- a/include/audio/dmic.h +++ b/include/audio/dmic.h @@ -248,7 +248,7 @@ static inline uint32_t dmic_build_clk_skew_map(uint8_t pdm, uint8_t skew) static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg) { const struct _dmic_ops *api = - (const struct _dmic_ops *)dev->driver_api; + (const struct _dmic_ops *)dev->api; return api->configure(dev, cfg); } @@ -266,7 +266,7 @@ static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg) static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd) { const struct _dmic_ops *api = - (const struct _dmic_ops *)dev->driver_api; + (const struct _dmic_ops *)dev->api; return api->trigger(dev, cmd); } @@ -290,7 +290,7 @@ static inline int dmic_read(struct device *dev, uint8_t stream, void **buffer, size_t *size, int32_t timeout) { const struct _dmic_ops *api = - (const struct _dmic_ops *)dev->driver_api; + (const struct _dmic_ops *)dev->api; return api->read(dev, stream, buffer, size, timeout); } diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h index 71e27329861..1652ef455c1 100644 --- a/include/crypto/cipher.h +++ b/include/crypto/cipher.h @@ -78,7 +78,7 @@ static inline int cipher_query_hwcaps(struct device *dev) struct crypto_driver_api *api; int tmp; - api = (struct crypto_driver_api *) dev->driver_api; + api = (struct crypto_driver_api *) dev->api; tmp = api->query_hw_caps(dev); @@ -122,7 +122,7 @@ static inline int cipher_begin_session(struct device *dev, struct crypto_driver_api *api; uint32_t flags; - api = (struct crypto_driver_api *) dev->driver_api; + api = (struct crypto_driver_api *) dev->api; ctx->device = dev; ctx->ops.cipher_mode = mode; @@ -160,7 +160,7 @@ static inline int cipher_free_session(struct device *dev, { struct crypto_driver_api *api; - api = (struct crypto_driver_api *) dev->driver_api; + api = (struct crypto_driver_api *) dev->api; return api->free_session(dev, ctx); } @@ -184,7 +184,7 @@ static inline int cipher_callback_set(struct device *dev, { struct crypto_driver_api *api; - api = (struct crypto_driver_api *) dev->driver_api; + api = (struct crypto_driver_api *) dev->api; if (api->crypto_async_callback_set) { return api->crypto_async_callback_set(dev, cb); diff --git a/include/display/framebuf.h b/include/display/framebuf.h index a69220b9e9e..0ef97285d73 100644 --- a/include/display/framebuf.h +++ b/include/display/framebuf.h @@ -18,6 +18,6 @@ struct framebuf_dev_data { uint16_t height; }; -#define FRAMEBUF_DATA(dev) ((struct framebuf_dev_data *) ((dev)->driver_data)) +#define FRAMEBUF_DATA(dev) ((struct framebuf_dev_data *) ((dev)->data)) #endif /* ZEPHYR_INCLUDE_DISPLAY_FRAMEBUF_H_ */ diff --git a/include/drivers/adc.h b/include/drivers/adc.h index 0d1a5746d9f..23210a588a6 100644 --- a/include/drivers/adc.h +++ b/include/drivers/adc.h @@ -381,7 +381,7 @@ static inline int z_impl_adc_channel_setup(struct device *dev, const struct adc_channel_cfg *channel_cfg) { const struct adc_driver_api *api = - (const struct adc_driver_api *)dev->driver_api; + (const struct adc_driver_api *)dev->api; return api->channel_setup(dev, channel_cfg); } @@ -414,7 +414,7 @@ static inline int z_impl_adc_read(struct device *dev, const struct adc_sequence *sequence) { const struct adc_driver_api *api = - (const struct adc_driver_api *)dev->driver_api; + (const struct adc_driver_api *)dev->api; return api->read(dev, sequence); } @@ -446,7 +446,7 @@ static inline int z_impl_adc_read_async(struct device *dev, struct k_poll_signal *async) { const struct adc_driver_api *api = - (const struct adc_driver_api *)dev->driver_api; + (const struct adc_driver_api *)dev->api; return api->read_async(dev, sequence, async); } @@ -464,7 +464,7 @@ static inline int z_impl_adc_read_async(struct device *dev, static inline uint16_t adc_ref_internal(struct device *dev) { const struct adc_driver_api *api = - (const struct adc_driver_api *)dev->driver_api; + (const struct adc_driver_api *)dev->api; return api->ref_internal; } diff --git a/include/drivers/can.h b/include/drivers/can.h index ab832c5bcd0..532610691b8 100644 --- a/include/drivers/can.h +++ b/include/drivers/can.h @@ -354,7 +354,7 @@ static inline int z_impl_can_send(struct device *dev, void *callback_arg) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->send(dev, msg, timeout, callback_isr, callback_arg); } @@ -478,7 +478,7 @@ static inline int can_attach_isr(struct device *dev, const struct zcan_filter *filter) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->attach_isr(dev, isr, callback_arg, filter); } @@ -499,7 +499,7 @@ __syscall void can_detach(struct device *dev, int filter_id); static inline void z_impl_can_detach(struct device *dev, int filter_id) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->detach(dev, filter_id); } @@ -521,7 +521,7 @@ static inline int z_impl_can_configure(struct device *dev, enum can_mode mode, uint32_t bitrate) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->configure(dev, mode, bitrate); } @@ -544,7 +544,7 @@ enum can_state z_impl_can_get_state(struct device *dev, struct can_bus_err_cnt *err_cnt) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->get_state(dev, err_cnt); } @@ -566,7 +566,7 @@ __syscall int can_recover(struct device *dev, k_timeout_t timeout); static inline int z_impl_can_recover(struct device *dev, k_timeout_t timeout) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->recover(dev, timeout); } @@ -592,7 +592,7 @@ void can_register_state_change_isr(struct device *dev, can_state_change_isr_t isr) { const struct can_driver_api *api = - (const struct can_driver_api *)dev->driver_api; + (const struct can_driver_api *)dev->api; return api->register_state_change_isr(dev, isr); } diff --git a/include/drivers/clock_control.h b/include/drivers/clock_control.h index 1210eff28a4..08f8bf2c36b 100644 --- a/include/drivers/clock_control.h +++ b/include/drivers/clock_control.h @@ -139,7 +139,7 @@ static inline int clock_control_on(struct device *dev, clock_control_subsys_t sys) { const struct clock_control_driver_api *api = - (const struct clock_control_driver_api *)dev->driver_api; + (const struct clock_control_driver_api *)dev->api; return api->on(dev, sys); } @@ -158,7 +158,7 @@ static inline int clock_control_off(struct device *dev, clock_control_subsys_t sys) { const struct clock_control_driver_api *api = - (const struct clock_control_driver_api *)dev->driver_api; + (const struct clock_control_driver_api *)dev->api; return api->off(dev, sys); } @@ -186,7 +186,7 @@ static inline int clock_control_async_on(struct device *dev, struct clock_control_async_data *data) { const struct clock_control_driver_api *api = - (const struct clock_control_driver_api *)dev->driver_api; + (const struct clock_control_driver_api *)dev->api; if (!api->async_on) { return -ENOTSUP; @@ -208,7 +208,7 @@ static inline enum clock_control_status clock_control_get_status( clock_control_subsys_t sys) { const struct clock_control_driver_api *api = - (const struct clock_control_driver_api *)dev->driver_api; + (const struct clock_control_driver_api *)dev->api; if (!api->get_status) { return CLOCK_CONTROL_STATUS_UNKNOWN; @@ -229,7 +229,7 @@ static inline int clock_control_get_rate(struct device *dev, uint32_t *rate) { const struct clock_control_driver_api *api = - (const struct clock_control_driver_api *)dev->driver_api; + (const struct clock_control_driver_api *)dev->api; __ASSERT(api->get_rate != NULL, "%s not implemented for device %s", __func__, dev->name); diff --git a/include/drivers/console/uart_mux.h b/include/drivers/console/uart_mux.h index 6806ed9f2ba..1b697f6fc76 100644 --- a/include/drivers/console/uart_mux.h +++ b/include/drivers/console/uart_mux.h @@ -77,7 +77,7 @@ static inline int uart_mux_attach(struct device *mux, struct device *uart, void *user_data) { const struct uart_mux_driver_api *api = - (const struct uart_mux_driver_api *)mux->driver_api; + (const struct uart_mux_driver_api *)mux->api; return api->attach(mux, uart, dlci_address, cb, user_data); } diff --git a/include/drivers/counter.h b/include/drivers/counter.h index d9f9f093014..415c35a95a0 100644 --- a/include/drivers/counter.h +++ b/include/drivers/counter.h @@ -320,7 +320,7 @@ __syscall int counter_start(struct device *dev); static inline int z_impl_counter_start(struct device *dev) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->start(dev); } @@ -339,7 +339,7 @@ __syscall int counter_stop(struct device *dev); static inline int z_impl_counter_stop(struct device *dev) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->stop(dev); } @@ -357,7 +357,7 @@ __syscall int counter_get_value(struct device *dev, uint32_t *ticks); static inline int z_impl_counter_get_value(struct device *dev, uint32_t *ticks) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->get_value(dev, ticks); } @@ -388,7 +388,7 @@ static inline int z_impl_counter_set_channel_alarm(struct device *dev, uint8_t chan_id, const struct counter_alarm_cfg *alarm_cfg) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; if (chan_id >= counter_get_num_of_channels(dev)) { return -ENOTSUP; @@ -415,7 +415,7 @@ static inline int z_impl_counter_cancel_channel_alarm(struct device *dev, uint8_t chan_id) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; if (chan_id >= counter_get_num_of_channels(dev)) { return -ENOTSUP; @@ -456,7 +456,7 @@ static inline int z_impl_counter_set_top_value(struct device *dev, *cfg) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; if (cfg->ticks > counter_get_max_top_value(dev)) { return -EINVAL; @@ -483,7 +483,7 @@ __syscall int counter_get_pending_int(struct device *dev); static inline int z_impl_counter_get_pending_int(struct device *dev) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->get_pending_int(dev); } @@ -500,7 +500,7 @@ __syscall uint32_t counter_get_top_value(struct device *dev); static inline uint32_t z_impl_counter_get_top_value(struct device *dev) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->get_top_value(dev); } @@ -518,7 +518,7 @@ __deprecated __syscall uint32_t counter_get_max_relative_alarm(struct device *de static inline uint32_t z_impl_counter_get_max_relative_alarm(struct device *dev) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return api->get_max_relative_alarm(dev); } @@ -558,7 +558,7 @@ static inline int z_impl_counter_set_guard_period(struct device *dev, uint32_t ticks, uint32_t flags) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; if (!api->set_guard_period) { return -ENOTSUP; @@ -584,7 +584,7 @@ static inline uint32_t z_impl_counter_get_guard_period(struct device *dev, uint32_t flags) { const struct counter_driver_api *api = - (struct counter_driver_api *)dev->driver_api; + (struct counter_driver_api *)dev->api; return (api->get_guard_period) ? api->get_guard_period(dev, flags) : 0; } diff --git a/include/drivers/dac.h b/include/drivers/dac.h index e17766cd4a5..de2fb9f9187 100644 --- a/include/drivers/dac.h +++ b/include/drivers/dac.h @@ -92,7 +92,7 @@ static inline int z_impl_dac_channel_setup(struct device *dev, const struct dac_channel_cfg *channel_cfg) { const struct dac_driver_api *api = - (const struct dac_driver_api *)dev->driver_api; + (const struct dac_driver_api *)dev->api; return api->channel_setup(dev, channel_cfg); } @@ -113,7 +113,7 @@ static inline int z_impl_dac_write_value(struct device *dev, uint8_t channel, uint32_t value) { const struct dac_driver_api *api = - (const struct dac_driver_api *)dev->driver_api; + (const struct dac_driver_api *)dev->api; return api->write_value(dev, channel, value); } diff --git a/include/drivers/display.h b/include/drivers/display.h index 3b42fd4fd81..4ff7d9e0774 100644 --- a/include/drivers/display.h +++ b/include/drivers/display.h @@ -251,7 +251,7 @@ static inline int display_write(const struct device *dev, const uint16_t x, const void *buf) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->write(dev, x, y, desc, buf); } @@ -273,7 +273,7 @@ static inline int display_read(const struct device *dev, const uint16_t x, void *buf) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->read(dev, x, y, desc, buf); } @@ -290,7 +290,7 @@ static inline int display_read(const struct device *dev, const uint16_t x, static inline void *display_get_framebuffer(const struct device *dev) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->get_framebuffer(dev); } @@ -316,7 +316,7 @@ static inline void *display_get_framebuffer(const struct device *dev) static inline int display_blanking_on(const struct device *dev) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->blanking_on(dev); } @@ -335,7 +335,7 @@ static inline int display_blanking_on(const struct device *dev) static inline int display_blanking_off(const struct device *dev) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->blanking_off(dev); } @@ -355,7 +355,7 @@ static inline int display_set_brightness(const struct device *dev, uint8_t brightness) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->set_brightness(dev, brightness); } @@ -374,7 +374,7 @@ static inline int display_set_brightness(const struct device *dev, static inline int display_set_contrast(const struct device *dev, uint8_t contrast) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->set_contrast(dev, contrast); } @@ -390,7 +390,7 @@ static inline void display_get_capabilities(const struct device *dev, capabilities) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; api->get_capabilities(dev, capabilities); } @@ -408,7 +408,7 @@ display_set_pixel_format(const struct device *dev, const enum display_pixel_format pixel_format) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->set_pixel_format(dev, pixel_format); } @@ -426,7 +426,7 @@ static inline int display_set_orientation(const struct device *dev, orientation) { struct display_driver_api *api = - (struct display_driver_api *)dev->driver_api; + (struct display_driver_api *)dev->api; return api->set_orientation(dev, orientation); } diff --git a/include/drivers/dma.h b/include/drivers/dma.h index 754cb34d8fc..9f391630cff 100644 --- a/include/drivers/dma.h +++ b/include/drivers/dma.h @@ -244,7 +244,7 @@ static inline int dma_config(struct device *dev, uint32_t channel, struct dma_config *config) { const struct dma_driver_api *api = - (const struct dma_driver_api *)dev->driver_api; + (const struct dma_driver_api *)dev->api; return api->config(dev, channel, config); } @@ -271,7 +271,7 @@ static inline int dma_reload(struct device *dev, uint32_t channel, #endif { const struct dma_driver_api *api = - (const struct dma_driver_api *)dev->driver_api; + (const struct dma_driver_api *)dev->api; if (api->reload) { return api->reload(dev, channel, src, dst, size); @@ -299,7 +299,7 @@ __syscall int dma_start(struct device *dev, uint32_t channel); static inline int z_impl_dma_start(struct device *dev, uint32_t channel) { const struct dma_driver_api *api = - (const struct dma_driver_api *)dev->driver_api; + (const struct dma_driver_api *)dev->api; return api->start(dev, channel); } @@ -322,7 +322,7 @@ __syscall int dma_stop(struct device *dev, uint32_t channel); static inline int z_impl_dma_stop(struct device *dev, uint32_t channel) { const struct dma_driver_api *api = - (const struct dma_driver_api *)dev->driver_api; + (const struct dma_driver_api *)dev->api; return api->stop(dev, channel); } @@ -345,7 +345,7 @@ static inline int dma_get_status(struct device *dev, uint32_t channel, struct dma_status *stat) { const struct dma_driver_api *api = - (const struct dma_driver_api *)dev->driver_api; + (const struct dma_driver_api *)dev->api; if (api->get_status) { return api->get_status(dev, channel, stat); diff --git a/include/drivers/eeprom.h b/include/drivers/eeprom.h index cabab9cdf23..2d2677249ae 100644 --- a/include/drivers/eeprom.h +++ b/include/drivers/eeprom.h @@ -61,7 +61,7 @@ static inline int z_impl_eeprom_read(struct device *dev, off_t offset, void *data, size_t len) { const struct eeprom_driver_api *api = - (const struct eeprom_driver_api *)dev->driver_api; + (const struct eeprom_driver_api *)dev->api; return api->read(dev, offset, data, len); } @@ -83,7 +83,7 @@ static inline int z_impl_eeprom_write(struct device *dev, off_t offset, const void *data, size_t len) { const struct eeprom_driver_api *api = - (const struct eeprom_driver_api *)dev->driver_api; + (const struct eeprom_driver_api *)dev->api; return api->write(dev, offset, data, len); } @@ -100,7 +100,7 @@ __syscall size_t eeprom_get_size(struct device *dev); static inline size_t z_impl_eeprom_get_size(struct device *dev) { const struct eeprom_driver_api *api = - (const struct eeprom_driver_api *)dev->driver_api; + (const struct eeprom_driver_api *)dev->api; return api->size(dev); } diff --git a/include/drivers/entropy.h b/include/drivers/entropy.h index 6af011e516f..2c7614d9e93 100644 --- a/include/drivers/entropy.h +++ b/include/drivers/entropy.h @@ -70,7 +70,7 @@ static inline int z_impl_entropy_get_entropy(struct device *dev, uint16_t length) { const struct entropy_driver_api *api = - (const struct entropy_driver_api *)dev->driver_api; + (const struct entropy_driver_api *)dev->api; __ASSERT(api->get_entropy != NULL, "Callback pointer should not be NULL"); @@ -96,7 +96,7 @@ static inline int entropy_get_entropy_isr(struct device *dev, uint32_t flags) { const struct entropy_driver_api *api = - (const struct entropy_driver_api *)dev->driver_api; + (const struct entropy_driver_api *)dev->api; if (unlikely(!api->get_entropy_isr)) { return -ENOTSUP; diff --git a/include/drivers/espi.h b/include/drivers/espi.h index 32dbba4f29e..320817f87d1 100644 --- a/include/drivers/espi.h +++ b/include/drivers/espi.h @@ -435,7 +435,7 @@ static inline int z_impl_espi_config(struct device *dev, struct espi_cfg *cfg) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; return api->config(dev, cfg); } @@ -459,7 +459,7 @@ static inline bool z_impl_espi_get_channel_status(struct device *dev, enum espi_channel ch) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; return api->get_channel_status(dev, ch); } @@ -485,7 +485,7 @@ static inline int z_impl_espi_read_request(struct device *dev, struct espi_request_packet *req) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->read_request) { return -ENOTSUP; @@ -515,7 +515,7 @@ static inline int z_impl_espi_write_request(struct device *dev, struct espi_request_packet *req) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->write_request) { return -ENOTSUP; @@ -548,7 +548,7 @@ static inline int z_impl_espi_read_lpc_request(struct device *dev, uint32_t *data) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->read_lpc_request) { return -ENOTSUP; @@ -581,7 +581,7 @@ static inline int z_impl_espi_write_lpc_request(struct device *dev, uint32_t *data) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->write_lpc_request) { return -ENOTSUP; @@ -612,7 +612,7 @@ static inline int z_impl_espi_send_vwire(struct device *dev, uint8_t level) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; return api->send_vwire(dev, signal, level); } @@ -638,7 +638,7 @@ static inline int z_impl_espi_receive_vwire(struct device *dev, uint8_t *level) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; return api->receive_vwire(dev, signal, level); } @@ -660,7 +660,7 @@ static inline int z_impl_espi_send_oob(struct device *dev, struct espi_oob_packet *pckt) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->send_oob) { return -ENOTSUP; @@ -687,7 +687,7 @@ static inline int z_impl_espi_receive_oob(struct device *dev, struct espi_oob_packet *pckt) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->receive_oob) { return -ENOTSUP; @@ -716,7 +716,7 @@ static inline int z_impl_espi_read_flash(struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->flash_read) { return -ENOTSUP; @@ -745,7 +745,7 @@ static inline int z_impl_espi_write_flash(struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->flash_write) { return -ENOTSUP; @@ -774,7 +774,7 @@ static inline int z_impl_espi_flash_erase(struct device *dev, struct espi_flash_packet *pckt) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->flash_erase) { return -ENOTSUP; @@ -878,7 +878,7 @@ static inline int espi_add_callback(struct device *dev, struct espi_callback *callback) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->manage_callback) { return -ENOTSUP; @@ -907,7 +907,7 @@ static inline int espi_remove_callback(struct device *dev, struct espi_callback *callback) { const struct espi_driver_api *api = - (const struct espi_driver_api *)dev->driver_api; + (const struct espi_driver_api *)dev->api; if (!api->manage_callback) { return -ENOTSUP; diff --git a/include/drivers/flash.h b/include/drivers/flash.h index a08db9c8ff5..866987eed4a 100644 --- a/include/drivers/flash.h +++ b/include/drivers/flash.h @@ -112,7 +112,7 @@ static inline int z_impl_flash_read(struct device *dev, off_t offset, void *data size_t len) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->read(dev, offset, data, len); } @@ -141,7 +141,7 @@ static inline int z_impl_flash_write(struct device *dev, off_t offset, const void *data, size_t len) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->write(dev, offset, data, len); } @@ -173,7 +173,7 @@ static inline int z_impl_flash_erase(struct device *dev, off_t offset, size_t size) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->erase(dev, offset, size); } @@ -217,7 +217,7 @@ static inline int z_impl_flash_write_protection_set(struct device *dev, bool enable) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->write_protection(dev, enable); } @@ -305,7 +305,7 @@ __syscall size_t flash_get_write_block_size(struct device *dev); static inline size_t z_impl_flash_get_write_block_size(struct device *dev) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->get_parameters(dev)->write_block_size; } @@ -327,7 +327,7 @@ __syscall const struct flash_parameters *flash_get_parameters(const struct devic static inline const struct flash_parameters *z_impl_flash_get_parameters(const struct device *dev) { const struct flash_driver_api *api = - (const struct flash_driver_api *)dev->driver_api; + (const struct flash_driver_api *)dev->api; return api->get_parameters(dev); } diff --git a/include/drivers/gna.h b/include/drivers/gna.h index f47130e018a..da22d5e3c7a 100644 --- a/include/drivers/gna.h +++ b/include/drivers/gna.h @@ -144,7 +144,7 @@ struct gna_driver_api { static inline int gna_configure(struct device *dev, struct gna_config *cfg) { const struct gna_driver_api *api = - (const struct gna_driver_api *)dev->driver_api; + (const struct gna_driver_api *)dev->api; return api->configure(dev, cfg); } @@ -166,7 +166,7 @@ static inline int gna_register_model(struct device *dev, struct gna_model_info *model, void **model_handle) { const struct gna_driver_api *api = - (const struct gna_driver_api *)dev->driver_api; + (const struct gna_driver_api *)dev->api; return api->register_model(dev, model, model_handle); } @@ -187,7 +187,7 @@ static inline int gna_register_model(struct device *dev, static inline int gna_deregister_model(struct device *dev, void *model) { const struct gna_driver_api *api = - (const struct gna_driver_api *)dev->driver_api; + (const struct gna_driver_api *)dev->api; return api->deregister_model(dev, model); } @@ -210,7 +210,7 @@ static inline int gna_infer(struct device *dev, struct gna_inference_req *req, gna_callback callback) { const struct gna_driver_api *api = - (const struct gna_driver_api *)dev->driver_api; + (const struct gna_driver_api *)dev->api; return api->infer(dev, req, callback); } diff --git a/include/drivers/gpio.h b/include/drivers/gpio.h index 93e64939ca0..7441cc9db05 100644 --- a/include/drivers/gpio.h +++ b/include/drivers/gpio.h @@ -431,7 +431,7 @@ static inline int z_impl_gpio_config(struct device *port, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->pin_configure(port, pin, flags); } @@ -469,11 +469,11 @@ static inline int z_impl_gpio_pin_interrupt_configure(struct device *port, gpio_flags_t flags) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config; const struct gpio_driver_data *const data = - (const struct gpio_driver_data *)port->driver_data; + (const struct gpio_driver_data *)port->data; enum gpio_int_trig trig; enum gpio_int_mode mode; @@ -534,11 +534,11 @@ static inline int gpio_pin_configure(struct device *port, gpio_pin_t pin, gpio_flags_t flags) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; const struct gpio_driver_config *const cfg = (const struct gpio_driver_config *)port->config; struct gpio_driver_data *data = - (struct gpio_driver_data *)port->driver_data; + (struct gpio_driver_data *)port->data; int ret; __ASSERT((flags & (GPIO_PULL_UP | GPIO_PULL_DOWN)) != @@ -613,7 +613,7 @@ static inline int z_impl_gpio_port_get_raw(struct device *port, gpio_port_value_t *value) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->port_get_raw(port, value); } @@ -639,7 +639,7 @@ static inline int z_impl_gpio_port_get_raw(struct device *port, static inline int gpio_port_get(struct device *port, gpio_port_value_t *value) { const struct gpio_driver_data *const data = - (const struct gpio_driver_data *)port->driver_data; + (const struct gpio_driver_data *)port->data; int ret; ret = gpio_port_get_raw(port, value); @@ -674,7 +674,7 @@ static inline int z_impl_gpio_port_set_masked_raw(struct device *port, gpio_port_pins_t mask, gpio_port_value_t value) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->port_set_masked_raw(port, mask, value); } @@ -703,7 +703,7 @@ static inline int gpio_port_set_masked(struct device *port, gpio_port_pins_t mask, gpio_port_value_t value) { const struct gpio_driver_data *const data = - (const struct gpio_driver_data *)port->driver_data; + (const struct gpio_driver_data *)port->data; value ^= data->invert; @@ -727,7 +727,7 @@ static inline int z_impl_gpio_port_set_bits_raw(struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->port_set_bits_raw(port, pins); } @@ -764,7 +764,7 @@ static inline int z_impl_gpio_port_clear_bits_raw(struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->port_clear_bits_raw(port, pins); } @@ -801,7 +801,7 @@ static inline int z_impl_gpio_port_toggle_bits(struct device *port, gpio_port_pins_t pins) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; return api->port_toggle_bits(port, pins); } @@ -977,7 +977,7 @@ 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; const struct gpio_driver_data *const data = - (const struct gpio_driver_data *)port->driver_data; + (const struct gpio_driver_data *)port->data; (void)cfg; __ASSERT((cfg->port_pin_mask & (gpio_port_pins_t)BIT(pin)) != 0U, @@ -1045,7 +1045,7 @@ static inline int gpio_add_callback(struct device *port, struct gpio_callback *callback) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; if (api->manage_callback == NULL) { return -ENOTSUP; @@ -1074,7 +1074,7 @@ static inline int gpio_remove_callback(struct device *port, struct gpio_callback *callback) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)port->driver_api; + (const struct gpio_driver_api *)port->api; if (api->manage_callback == NULL) { return -ENOTSUP; @@ -1101,7 +1101,7 @@ __syscall int gpio_get_pending_int(struct device *dev); static inline int z_impl_gpio_get_pending_int(struct device *dev) { const struct gpio_driver_api *api = - (const struct gpio_driver_api *)dev->driver_api; + (const struct gpio_driver_api *)dev->api; if (api->get_pending_int == NULL) { return -ENOTSUP; diff --git a/include/drivers/i2c.h b/include/drivers/i2c.h index 41b1a49bdd9..583b2175276 100644 --- a/include/drivers/i2c.h +++ b/include/drivers/i2c.h @@ -210,7 +210,7 @@ __syscall int i2c_configure(struct device *dev, uint32_t dev_config); static inline int z_impl_i2c_configure(struct device *dev, uint32_t dev_config) { const struct i2c_driver_api *api = - (const struct i2c_driver_api *)dev->driver_api; + (const struct i2c_driver_api *)dev->api; return api->configure(dev, dev_config); } @@ -250,7 +250,7 @@ static inline int z_impl_i2c_transfer(struct device *dev, uint16_t addr) { const struct i2c_driver_api *api = - (const struct i2c_driver_api *)dev->driver_api; + (const struct i2c_driver_api *)dev->api; return api->transfer(dev, msgs, num_msgs, addr); } @@ -271,7 +271,7 @@ __syscall int i2c_recover_bus(struct device *dev); static inline int z_impl_i2c_recover_bus(struct device *dev) { const struct i2c_driver_api *api = - (const struct i2c_driver_api *)dev->driver_api; + (const struct i2c_driver_api *)dev->api; if (api->recover_bus == NULL) { return -ENOTSUP; @@ -307,7 +307,7 @@ static inline int i2c_slave_register(struct device *dev, struct i2c_slave_config *cfg) { const struct i2c_driver_api *api = - (const struct i2c_driver_api *)dev->driver_api; + (const struct i2c_driver_api *)dev->api; if (api->slave_register == NULL) { return -ENOTSUP; @@ -335,7 +335,7 @@ static inline int i2c_slave_unregister(struct device *dev, struct i2c_slave_config *cfg) { const struct i2c_driver_api *api = - (const struct i2c_driver_api *)dev->driver_api; + (const struct i2c_driver_api *)dev->api; if (api->slave_unregister == NULL) { return -ENOTSUP; @@ -361,7 +361,7 @@ __syscall int i2c_slave_driver_register(struct device *dev); static inline int z_impl_i2c_slave_driver_register(struct device *dev) { const struct i2c_slave_driver_api *api = - (const struct i2c_slave_driver_api *)dev->driver_api; + (const struct i2c_slave_driver_api *)dev->api; return api->driver_register(dev); } @@ -383,7 +383,7 @@ __syscall int i2c_slave_driver_unregister(struct device *dev); static inline int z_impl_i2c_slave_driver_unregister(struct device *dev) { const struct i2c_slave_driver_api *api = - (const struct i2c_slave_driver_api *)dev->driver_api; + (const struct i2c_slave_driver_api *)dev->api; return api->driver_unregister(dev); } diff --git a/include/drivers/i2s.h b/include/drivers/i2s.h index 4b549856801..91dbf89a459 100644 --- a/include/drivers/i2s.h +++ b/include/drivers/i2s.h @@ -352,7 +352,7 @@ static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir, struct i2s_config *cfg) { const struct i2s_driver_api *api = - (const struct i2s_driver_api *)dev->driver_api; + (const struct i2s_driver_api *)dev->api; return api->configure(dev, dir, cfg); } @@ -369,7 +369,7 @@ static inline struct i2s_config *i2s_config_get(struct device *dev, enum i2s_dir dir) { const struct i2s_driver_api *api = - (const struct i2s_driver_api *)dev->driver_api; + (const struct i2s_driver_api *)dev->api; return api->config_get(dev, dir); } @@ -409,7 +409,7 @@ static inline int i2s_read(struct device *dev, void **mem_block, size_t *size) { const struct i2s_driver_api *api = - (const struct i2s_driver_api *)dev->driver_api; + (const struct i2s_driver_api *)dev->api; return api->read(dev, mem_block, size); } @@ -469,7 +469,7 @@ __syscall int i2s_buf_read(struct device *dev, void *buf, size_t *size); static inline int i2s_write(struct device *dev, void *mem_block, size_t size) { const struct i2s_driver_api *api = - (const struct i2s_driver_api *)dev->driver_api; + (const struct i2s_driver_api *)dev->api; return api->write(dev, mem_block, size); } @@ -515,7 +515,7 @@ static inline int z_impl_i2s_trigger(struct device *dev, enum i2s_dir dir, enum i2s_trigger_cmd cmd) { const struct i2s_driver_api *api = - (const struct i2s_driver_api *)dev->driver_api; + (const struct i2s_driver_api *)dev->api; return api->trigger(dev, dir, cmd); } diff --git a/include/drivers/ipm.h b/include/drivers/ipm.h index e8085deca6f..3e70981f7c3 100644 --- a/include/drivers/ipm.h +++ b/include/drivers/ipm.h @@ -136,7 +136,7 @@ static inline int z_impl_ipm_send(struct device *ipmdev, int wait, uint32_t id, const void *data, int size) { const struct ipm_driver_api *api = - (const struct ipm_driver_api *)ipmdev->driver_api; + (const struct ipm_driver_api *)ipmdev->api; return api->send(ipmdev, wait, id, data, size); } @@ -153,7 +153,7 @@ static inline void ipm_register_callback(struct device *ipmdev, ipm_callback_t cb, void *user_data) { const struct ipm_driver_api *api = - (const struct ipm_driver_api *)ipmdev->driver_api; + (const struct ipm_driver_api *)ipmdev->api; api->register_callback(ipmdev, cb, user_data); } @@ -173,7 +173,7 @@ __syscall int ipm_max_data_size_get(struct device *ipmdev); static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev) { const struct ipm_driver_api *api = - (const struct ipm_driver_api *)ipmdev->driver_api; + (const struct ipm_driver_api *)ipmdev->api; return api->max_data_size_get(ipmdev); } @@ -194,7 +194,7 @@ __syscall uint32_t ipm_max_id_val_get(struct device *ipmdev); static inline uint32_t z_impl_ipm_max_id_val_get(struct device *ipmdev) { const struct ipm_driver_api *api = - (const struct ipm_driver_api *)ipmdev->driver_api; + (const struct ipm_driver_api *)ipmdev->api; return api->max_id_val_get(ipmdev); } @@ -213,7 +213,7 @@ __syscall int ipm_set_enabled(struct device *ipmdev, int enable); static inline int z_impl_ipm_set_enabled(struct device *ipmdev, int enable) { const struct ipm_driver_api *api = - (const struct ipm_driver_api *)ipmdev->driver_api; + (const struct ipm_driver_api *)ipmdev->api; return api->set_enabled(ipmdev, enable); } diff --git a/include/drivers/kscan.h b/include/drivers/kscan.h index 61a353cf88f..7c1065cbf31 100644 --- a/include/drivers/kscan.h +++ b/include/drivers/kscan.h @@ -82,7 +82,7 @@ static inline int z_impl_kscan_config(struct device *dev, kscan_callback_t callback) { const struct kscan_driver_api *api = - (struct kscan_driver_api *)dev->driver_api; + (struct kscan_driver_api *)dev->api; return api->config(dev, callback); } @@ -98,7 +98,7 @@ __syscall int kscan_enable_callback(struct device *dev); static inline int z_impl_kscan_enable_callback(struct device *dev) { const struct kscan_driver_api *api = - (const struct kscan_driver_api *)dev->driver_api; + (const struct kscan_driver_api *)dev->api; if (api->enable_callback == NULL) { return -ENOTSUP; @@ -119,7 +119,7 @@ __syscall int kscan_disable_callback(struct device *dev); static inline int z_impl_kscan_disable_callback(struct device *dev) { const struct kscan_driver_api *api = - (const struct kscan_driver_api *)dev->driver_api; + (const struct kscan_driver_api *)dev->api; if (api->disable_callback == NULL) { return -ENOTSUP; diff --git a/include/drivers/led.h b/include/drivers/led.h index d1cf1207983..c2c4f82617b 100644 --- a/include/drivers/led.h +++ b/include/drivers/led.h @@ -85,7 +85,7 @@ static inline int z_impl_led_blink(struct device *dev, uint32_t led, uint32_t delay_on, uint32_t delay_off) { const struct led_driver_api *api = - (const struct led_driver_api *)dev->driver_api; + (const struct led_driver_api *)dev->api; return api->blink(dev, led, delay_on, delay_off); } @@ -108,7 +108,7 @@ static inline int z_impl_led_set_brightness(struct device *dev, uint32_t led, uint8_t value) { const struct led_driver_api *api = - (const struct led_driver_api *)dev->driver_api; + (const struct led_driver_api *)dev->api; return api->set_brightness(dev, led, value); } @@ -127,7 +127,7 @@ __syscall int led_on(struct device *dev, uint32_t led); static inline int z_impl_led_on(struct device *dev, uint32_t led) { const struct led_driver_api *api = - (const struct led_driver_api *)dev->driver_api; + (const struct led_driver_api *)dev->api; return api->on(dev, led); } @@ -146,7 +146,7 @@ __syscall int led_off(struct device *dev, uint32_t led); static inline int z_impl_led_off(struct device *dev, uint32_t led) { const struct led_driver_api *api = - (const struct led_driver_api *)dev->driver_api; + (const struct led_driver_api *)dev->api; return api->off(dev, led); } diff --git a/include/drivers/led_strip.h b/include/drivers/led_strip.h index 161d5d6c087..7f324f2add0 100644 --- a/include/drivers/led_strip.h +++ b/include/drivers/led_strip.h @@ -98,7 +98,7 @@ static inline int led_strip_update_rgb(struct device *dev, struct led_rgb *pixels, size_t num_pixels) { const struct led_strip_driver_api *api = - (const struct led_strip_driver_api *)dev->driver_api; + (const struct led_strip_driver_api *)dev->api; return api->update_rgb(dev, pixels, num_pixels); } @@ -124,7 +124,7 @@ static inline int led_strip_update_channels(struct device *dev, uint8_t *channels, size_t num_channels) { const struct led_strip_driver_api *api = - (const struct led_strip_driver_api *)dev->driver_api; + (const struct led_strip_driver_api *)dev->api; return api->update_channels(dev, channels, num_channels); } diff --git a/include/drivers/lora.h b/include/drivers/lora.h index 25e1fe12f5b..41ffda6364a 100644 --- a/include/drivers/lora.h +++ b/include/drivers/lora.h @@ -102,7 +102,7 @@ struct lora_driver_api { static inline int lora_config(struct device *dev, struct lora_modem_config *config) { - const struct lora_driver_api *api = dev->driver_api; + const struct lora_driver_api *api = dev->api; return api->config(dev, config); } @@ -120,7 +120,7 @@ static inline int lora_config(struct device *dev, static inline int lora_send(struct device *dev, uint8_t *data, uint32_t data_len) { - const struct lora_driver_api *api = dev->driver_api; + const struct lora_driver_api *api = dev->api; return api->send(dev, data, data_len); } @@ -144,7 +144,7 @@ static inline int lora_send(struct device *dev, static inline int lora_recv(struct device *dev, uint8_t *data, uint8_t size, k_timeout_t timeout, int16_t *rssi, int8_t *snr) { - const struct lora_driver_api *api = dev->driver_api; + const struct lora_driver_api *api = dev->api; return api->recv(dev, data, size, timeout, rssi, snr); } @@ -164,7 +164,7 @@ static inline int lora_recv(struct device *dev, uint8_t *data, uint8_t size, static inline int lora_test_cw(struct device *dev, uint32_t frequency, int8_t tx_power, uint16_t duration) { - const struct lora_driver_api *api = dev->driver_api; + const struct lora_driver_api *api = dev->api; if (!api->test_cw) { return -ENOTSUP; diff --git a/include/drivers/pcie/endpoint/pcie_ep.h b/include/drivers/pcie/endpoint/pcie_ep.h index 7f06985e4ba..f01747abdc0 100644 --- a/include/drivers/pcie/endpoint/pcie_ep.h +++ b/include/drivers/pcie/endpoint/pcie_ep.h @@ -85,7 +85,7 @@ static inline int pcie_ep_conf_read(struct device *dev, uint32_t offset, uint32_t *data) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; return api->conf_read(dev, offset, data); } @@ -106,7 +106,7 @@ static inline void pcie_ep_conf_write(struct device *dev, uint32_t offset, uint32_t data) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; api->conf_write(dev, offset, data); } @@ -141,7 +141,7 @@ static inline int pcie_ep_map_addr(struct device *dev, uint64_t pcie_addr, enum pcie_ob_mem_type ob_mem_type) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; return api->map_addr(dev, pcie_addr, mapped_addr, size, ob_mem_type); } @@ -162,7 +162,7 @@ static inline int pcie_ep_map_addr(struct device *dev, uint64_t pcie_addr, static inline void pcie_ep_unmap_addr(struct device *dev, uint64_t mapped_addr) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; api->unmap_addr(dev, mapped_addr); } @@ -184,7 +184,7 @@ static inline int pcie_ep_raise_irq(struct device *dev, uint32_t irq_num) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; return api->raise_irq(dev, irq_type, irq_num); } @@ -209,7 +209,7 @@ static inline int pcie_ep_register_reset_cb(struct device *dev, void *arg) { const struct pcie_ep_driver_api *api = - (const struct pcie_ep_driver_api *)dev->driver_api; + (const struct pcie_ep_driver_api *)dev->api; if (api->register_reset_cb) { return api->register_reset_cb(dev, reset, cb, arg); diff --git a/include/drivers/peci.h b/include/drivers/peci.h index de745e3d54f..3839997d283 100644 --- a/include/drivers/peci.h +++ b/include/drivers/peci.h @@ -224,7 +224,7 @@ static inline int z_impl_peci_config(struct device *dev, uint32_t bitrate) { struct peci_driver_api *api; - api = (struct peci_driver_api *)dev->driver_api; + api = (struct peci_driver_api *)dev->api; return api->config(dev, bitrate); } @@ -242,7 +242,7 @@ static inline int z_impl_peci_enable(struct device *dev) { struct peci_driver_api *api; - api = (struct peci_driver_api *)dev->driver_api; + api = (struct peci_driver_api *)dev->api; return api->enable(dev); } @@ -260,7 +260,7 @@ static inline int z_impl_peci_disable(struct device *dev) { struct peci_driver_api *api; - api = (struct peci_driver_api *)dev->driver_api; + api = (struct peci_driver_api *)dev->api; return api->disable(dev); } @@ -281,7 +281,7 @@ static inline int z_impl_peci_transfer(struct device *dev, { struct peci_driver_api *api; - api = (struct peci_driver_api *)dev->driver_api; + api = (struct peci_driver_api *)dev->api; return api->transfer(dev, msg); } diff --git a/include/drivers/pinmux.h b/include/drivers/pinmux.h index b1e203d2e59..b75f6d81fa0 100644 --- a/include/drivers/pinmux.h +++ b/include/drivers/pinmux.h @@ -84,7 +84,7 @@ __subsystem struct pinmux_driver_api { static inline int pinmux_pin_set(struct device *dev, uint32_t pin, uint32_t func) { const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; + (const struct pinmux_driver_api *)dev->api; return api->set(dev, pin, func); } @@ -92,7 +92,7 @@ static inline int pinmux_pin_set(struct device *dev, uint32_t pin, uint32_t func static inline int pinmux_pin_get(struct device *dev, uint32_t pin, uint32_t *func) { const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; + (const struct pinmux_driver_api *)dev->api; return api->get(dev, pin, func); } @@ -100,7 +100,7 @@ static inline int pinmux_pin_get(struct device *dev, uint32_t pin, uint32_t *fun static inline int pinmux_pin_pullup(struct device *dev, uint32_t pin, uint8_t func) { const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; + (const struct pinmux_driver_api *)dev->api; return api->pullup(dev, pin, func); } @@ -109,7 +109,7 @@ static inline int pinmux_pin_input_enable(struct device *dev, uint32_t pin, uint8_t func) { const struct pinmux_driver_api *api = - (const struct pinmux_driver_api *)dev->driver_api; + (const struct pinmux_driver_api *)dev->api; return api->input(dev, pin, func); } diff --git a/include/drivers/ps2.h b/include/drivers/ps2.h index 0f76947f759..4a54d9e8676 100644 --- a/include/drivers/ps2.h +++ b/include/drivers/ps2.h @@ -77,7 +77,7 @@ static inline int z_impl_ps2_config(struct device *dev, ps2_callback_t callback_isr) { const struct ps2_driver_api *api = - (struct ps2_driver_api *)dev->driver_api; + (struct ps2_driver_api *)dev->api; return api->config(dev, callback_isr); } @@ -96,7 +96,7 @@ __syscall int ps2_write(struct device *dev, uint8_t value); static inline int z_impl_ps2_write(struct device *dev, uint8_t value) { const struct ps2_driver_api *api = - (const struct ps2_driver_api *)dev->driver_api; + (const struct ps2_driver_api *)dev->api; return api->write(dev, value); } @@ -114,7 +114,7 @@ __syscall int ps2_read(struct device *dev, uint8_t *value); static inline int z_impl_ps2_read(struct device *dev, uint8_t *value) { const struct ps2_driver_api *api = - (const struct ps2_driver_api *)dev->driver_api; + (const struct ps2_driver_api *)dev->api; return api->read(dev, value); } @@ -131,7 +131,7 @@ __syscall int ps2_enable_callback(struct device *dev); static inline int z_impl_ps2_enable_callback(struct device *dev) { const struct ps2_driver_api *api = - (const struct ps2_driver_api *)dev->driver_api; + (const struct ps2_driver_api *)dev->api; if (api->enable_callback == NULL) { return -ENOTSUP; @@ -152,7 +152,7 @@ __syscall int ps2_disable_callback(struct device *dev); static inline int z_impl_ps2_disable_callback(struct device *dev) { const struct ps2_driver_api *api = - (const struct ps2_driver_api *)dev->driver_api; + (const struct ps2_driver_api *)dev->api; if (api->disable_callback == NULL) { return -ENOTSUP; diff --git a/include/drivers/pwm.h b/include/drivers/pwm.h index b2e29530708..ab40b19830e 100644 --- a/include/drivers/pwm.h +++ b/include/drivers/pwm.h @@ -83,7 +83,7 @@ static inline int z_impl_pwm_pin_set_cycles(struct device *dev, uint32_t pwm, { struct pwm_driver_api *api; - api = (struct pwm_driver_api *)dev->driver_api; + api = (struct pwm_driver_api *)dev->api; return api->pin_set(dev, pwm, period, pulse, flags); } @@ -107,7 +107,7 @@ static inline int z_impl_pwm_get_cycles_per_sec(struct device *dev, uint32_t pwm { struct pwm_driver_api *api; - api = (struct pwm_driver_api *)dev->driver_api; + api = (struct pwm_driver_api *)dev->api; return api->get_cycles_per_sec(dev, pwm, cycles); } diff --git a/include/drivers/sensor.h b/include/drivers/sensor.h index fa74508dcd9..f320898d36a 100644 --- a/include/drivers/sensor.h +++ b/include/drivers/sensor.h @@ -402,7 +402,7 @@ static inline int z_impl_sensor_attr_set(struct device *dev, const struct sensor_value *val) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; if (api->attr_set == NULL) { return -ENOTSUP; @@ -434,7 +434,7 @@ static inline int z_impl_sensor_attr_get(struct device *dev, struct sensor_value *val) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; if (api->attr_get == NULL) { return -ENOTSUP; @@ -465,7 +465,7 @@ static inline int sensor_trigger_set(struct device *dev, sensor_trigger_handler_t handler) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; if (api->trigger_set == NULL) { return -ENOTSUP; @@ -495,7 +495,7 @@ __syscall int sensor_sample_fetch(struct device *dev); static inline int z_impl_sensor_sample_fetch(struct device *dev) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; return api->sample_fetch(dev, SENSOR_CHAN_ALL); } @@ -526,7 +526,7 @@ static inline int z_impl_sensor_sample_fetch_chan(struct device *dev, enum sensor_channel type) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; return api->sample_fetch(dev, type); } @@ -561,7 +561,7 @@ static inline int z_impl_sensor_channel_get(struct device *dev, struct sensor_value *val) { const struct sensor_driver_api *api = - (const struct sensor_driver_api *)dev->driver_api; + (const struct sensor_driver_api *)dev->api; return api->channel_get(dev, chan, val); } diff --git a/include/drivers/spi.h b/include/drivers/spi.h index d5d386eef17..7ff6603ce8a 100644 --- a/include/drivers/spi.h +++ b/include/drivers/spi.h @@ -264,7 +264,7 @@ static inline int z_impl_spi_transceive(struct device *dev, const struct spi_buf_set *rx_bufs) { const struct spi_driver_api *api = - (const struct spi_driver_api *)dev->driver_api; + (const struct spi_driver_api *)dev->api; return api->transceive(dev, config, tx_bufs, rx_bufs); } @@ -337,7 +337,7 @@ static inline int spi_transceive_async(struct device *dev, { #ifdef CONFIG_SPI_ASYNC const struct spi_driver_api *api = - (const struct spi_driver_api *)dev->driver_api; + (const struct spi_driver_api *)dev->api; return api->transceive_async(dev, config, tx_bufs, rx_bufs, async); #else @@ -421,7 +421,7 @@ static inline int z_impl_spi_release(struct device *dev, const struct spi_config *config) { const struct spi_driver_api *api = - (const struct spi_driver_api *)dev->driver_api; + (const struct spi_driver_api *)dev->api; return api->release(dev, config); } diff --git a/include/drivers/uart.h b/include/drivers/uart.h index 57eef1c7314..ef3cec732f9 100644 --- a/include/drivers/uart.h +++ b/include/drivers/uart.h @@ -442,7 +442,7 @@ static inline int uart_callback_set(struct device *dev, { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->callback_set(dev, callback, user_data); #else @@ -475,7 +475,7 @@ static inline int z_impl_uart_tx(struct device *dev, const uint8_t *buf, { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->tx(dev, buf, len, timeout); #else @@ -500,7 +500,7 @@ static inline int z_impl_uart_tx_abort(struct device *dev) { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->tx_abort(dev); #else @@ -533,7 +533,7 @@ static inline int z_impl_uart_rx_enable(struct device *dev, uint8_t *buf, { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->rx_enable(dev, buf, len, timeout); #else @@ -565,7 +565,7 @@ static inline int uart_rx_buf_rsp(struct device *dev, uint8_t *buf, size_t len) { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->rx_buf_rsp(dev, buf, len); #else @@ -593,7 +593,7 @@ static inline int z_impl_uart_rx_disable(struct device *dev) { #ifdef CONFIG_UART_ASYNC_API const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->rx_disable(dev); #else @@ -614,7 +614,7 @@ __syscall int uart_err_check(struct device *dev); static inline int z_impl_uart_err_check(struct device *dev) { const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->err_check != NULL) { return api->err_check(dev); @@ -640,7 +640,7 @@ __syscall int uart_poll_in(struct device *dev, unsigned char *p_char); static inline int z_impl_uart_poll_in(struct device *dev, unsigned char *p_char) { const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; return api->poll_in(dev, p_char); } @@ -665,7 +665,7 @@ static inline void z_impl_uart_poll_out(struct device *dev, unsigned char out_char) { const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; api->poll_out(dev, out_char); } @@ -689,7 +689,7 @@ static inline int z_impl_uart_configure(struct device *dev, const struct uart_config *cfg) { const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->configure != NULL) { return api->configure(dev, cfg); @@ -716,7 +716,7 @@ static inline int z_impl_uart_config_get(struct device *dev, struct uart_config *cfg) { const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->config_get != NULL) { return api->config_get(dev, cfg); @@ -748,7 +748,7 @@ static inline int uart_fifo_fill(struct device *dev, const uint8_t *tx_data, { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->fifo_fill) { return api->fifo_fill(dev, tx_data, size); @@ -785,7 +785,7 @@ static inline int uart_fifo_read(struct device *dev, uint8_t *rx_data, { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->fifo_read) { return api->fifo_read(dev, rx_data, size); @@ -808,7 +808,7 @@ static inline void z_impl_uart_irq_tx_enable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_tx_enable) { api->irq_tx_enable(dev); @@ -828,7 +828,7 @@ static inline void z_impl_uart_irq_tx_disable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_tx_disable) { api->irq_tx_disable(dev); @@ -855,7 +855,7 @@ static inline int uart_irq_tx_ready(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_tx_ready) { return api->irq_tx_ready(dev); @@ -878,7 +878,7 @@ static inline void z_impl_uart_irq_rx_enable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_rx_enable) { api->irq_rx_enable(dev); @@ -899,7 +899,7 @@ static inline void z_impl_uart_irq_rx_disable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_rx_disable) { api->irq_rx_disable(dev); @@ -929,7 +929,7 @@ static inline int uart_irq_tx_complete(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_tx_complete) { return api->irq_tx_complete(dev); @@ -962,7 +962,7 @@ static inline int uart_irq_rx_ready(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_rx_ready) { return api->irq_rx_ready(dev); @@ -984,7 +984,7 @@ static inline void z_impl_uart_irq_err_enable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_err_enable) { api->irq_err_enable(dev); @@ -1006,7 +1006,7 @@ static inline void z_impl_uart_irq_err_disable(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_err_disable) { api->irq_err_disable(dev); @@ -1028,7 +1028,7 @@ static inline int z_impl_uart_irq_is_pending(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_is_pending) { return api->irq_is_pending(dev); @@ -1066,7 +1066,7 @@ static inline int z_impl_uart_irq_update(struct device *dev) { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->irq_update) { return api->irq_update(dev); @@ -1095,7 +1095,7 @@ static inline void uart_irq_callback_user_data_set( { #ifdef CONFIG_UART_INTERRUPT_DRIVEN const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if ((api != NULL) && (api->irq_callback_set != NULL)) { api->irq_callback_set(dev, cb, user_data); @@ -1139,7 +1139,7 @@ static inline int z_impl_uart_line_ctrl_set(struct device *dev, { #ifdef CONFIG_UART_LINE_CTRL const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->line_ctrl_set) { return api->line_ctrl_set(dev, ctrl, val); @@ -1166,7 +1166,7 @@ static inline int z_impl_uart_line_ctrl_get(struct device *dev, { #ifdef CONFIG_UART_LINE_CTRL const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api && api->line_ctrl_get) { return api->line_ctrl_get(dev, ctrl, val); @@ -1195,7 +1195,7 @@ static inline int z_impl_uart_drv_cmd(struct device *dev, uint32_t cmd, uint32_t { #ifdef CONFIG_UART_DRV_CMD const struct uart_driver_api *api = - (const struct uart_driver_api *)dev->driver_api; + (const struct uart_driver_api *)dev->api; if (api->drv_cmd) { return api->drv_cmd(dev, cmd, p); diff --git a/include/drivers/video.h b/include/drivers/video.h index ff8a3f2a2a3..a26127b2139 100644 --- a/include/drivers/video.h +++ b/include/drivers/video.h @@ -261,7 +261,7 @@ static inline int video_set_format(struct device *dev, struct video_format *fmt) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; __ASSERT(api->set_format, "set_format must be implemented by driver"); @@ -284,7 +284,7 @@ static inline int video_get_format(struct device *dev, struct video_format *fmt) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; __ASSERT(api->get_format, "get_format must be implemented by driver"); @@ -309,7 +309,7 @@ static inline int video_enqueue(struct device *dev, enum video_endpoint_id ep, struct video_buffer *buf) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->enqueue == NULL) { return -ENOTSUP; @@ -338,7 +338,7 @@ static inline int video_dequeue(struct device *dev, enum video_endpoint_id ep, k_timeout_t timeout) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->dequeue == NULL) { return -ENOTSUP; @@ -366,7 +366,7 @@ static inline int video_flush(struct device *dev, enum video_endpoint_id ep, bool cancel) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->flush == NULL) { return -ENOTSUP; @@ -390,7 +390,7 @@ static inline int video_flush(struct device *dev, enum video_endpoint_id ep, static inline int video_stream_start(struct device *dev) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; __ASSERT(api->stream_start, "stream_start must be implemented by driver"); @@ -410,7 +410,7 @@ static inline int video_stream_start(struct device *dev) static inline int video_stream_stop(struct device *dev) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; int ret; __ASSERT(api->stream_stop, @@ -436,7 +436,7 @@ static inline int video_get_caps(struct device *dev, struct video_caps *caps) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; __ASSERT(api->get_caps, "get_caps must be implemented by driver"); @@ -462,7 +462,7 @@ static inline int video_set_ctrl(struct device *dev, unsigned int cid, void *value) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->set_ctrl == NULL) { return -ENOTSUP; @@ -490,7 +490,7 @@ static inline int video_get_ctrl(struct device *dev, unsigned int cid, void *value) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->get_ctrl == NULL) { return -ENOTSUP; @@ -517,7 +517,7 @@ static inline int video_set_signal(struct device *dev, struct k_poll_signal *signal) { const struct video_driver_api *api = - (const struct video_driver_api *)dev->driver_api; + (const struct video_driver_api *)dev->api; if (api->set_signal == NULL) { return -ENOTSUP; diff --git a/include/drivers/watchdog.h b/include/drivers/watchdog.h index a9c8eb8bb8a..90a8c469b26 100644 --- a/include/drivers/watchdog.h +++ b/include/drivers/watchdog.h @@ -165,7 +165,7 @@ __syscall int wdt_setup(struct device *dev, uint8_t options); static inline int z_impl_wdt_setup(struct device *dev, uint8_t options) { const struct wdt_driver_api *api = - (const struct wdt_driver_api *)dev->driver_api; + (const struct wdt_driver_api *)dev->api; return api->setup(dev, options); } @@ -188,7 +188,7 @@ __syscall int wdt_disable(struct device *dev); static inline int z_impl_wdt_disable(struct device *dev) { const struct wdt_driver_api *api = - (const struct wdt_driver_api *)dev->driver_api; + (const struct wdt_driver_api *)dev->api; return api->disable(dev); } @@ -219,7 +219,7 @@ static inline int wdt_install_timeout(struct device *dev, const struct wdt_timeout_cfg *cfg) { const struct wdt_driver_api *api = - (const struct wdt_driver_api *) dev->driver_api; + (const struct wdt_driver_api *) dev->api; return api->install_timeout(dev, cfg); } @@ -241,7 +241,7 @@ __syscall int wdt_feed(struct device *dev, int channel_id); static inline int z_impl_wdt_feed(struct device *dev, int channel_id) { const struct wdt_driver_api *api = - (const struct wdt_driver_api *)dev->driver_api; + (const struct wdt_driver_api *)dev->api; return api->feed(dev, channel_id); } diff --git a/include/irq_nextlevel.h b/include/irq_nextlevel.h index 2d8fb0c3e3f..6901085ff8f 100644 --- a/include/irq_nextlevel.h +++ b/include/irq_nextlevel.h @@ -52,7 +52,7 @@ struct irq_next_level_api { static inline void irq_enable_next_level(struct device *dev, uint32_t irq) { const struct irq_next_level_api *api = - (const struct irq_next_level_api *)dev->driver_api; + (const struct irq_next_level_api *)dev->api; api->intr_enable(dev, irq); } @@ -70,7 +70,7 @@ static inline void irq_enable_next_level(struct device *dev, uint32_t irq) static inline void irq_disable_next_level(struct device *dev, uint32_t irq) { const struct irq_next_level_api *api = - (const struct irq_next_level_api *)dev->driver_api; + (const struct irq_next_level_api *)dev->api; api->intr_disable(dev, irq); } @@ -88,7 +88,7 @@ static inline void irq_disable_next_level(struct device *dev, uint32_t irq) static inline unsigned int irq_is_enabled_next_level(struct device *dev) { const struct irq_next_level_api *api = - (const struct irq_next_level_api *)dev->driver_api; + (const struct irq_next_level_api *)dev->api; return api->intr_get_state(dev); } @@ -110,7 +110,7 @@ static inline void irq_set_priority_next_level(struct device *dev, uint32_t irq, uint32_t prio, uint32_t flags) { const struct irq_next_level_api *api = - (const struct irq_next_level_api *)dev->driver_api; + (const struct irq_next_level_api *)dev->api; if (api->intr_set_priority) api->intr_set_priority(dev, irq, prio, flags); @@ -130,7 +130,7 @@ static inline unsigned int irq_line_is_enabled_next_level(struct device *dev, unsigned int irq) { const struct irq_next_level_api *api = - (const struct irq_next_level_api *)dev->driver_api; + (const struct irq_next_level_api *)dev->api; return api->intr_get_line_state(dev, irq); } diff --git a/include/net/ethernet.h b/include/net/ethernet.h index 415b9d3703c..d7b074c3019 100644 --- a/include/net/ethernet.h +++ b/include/net/ethernet.h @@ -492,7 +492,7 @@ static inline enum ethernet_hw_caps net_eth_get_hw_capabilities(struct net_if *iface) { const struct ethernet_api *eth = - (struct ethernet_api *)net_if_get_device(iface)->driver_api; + (struct ethernet_api *)net_if_get_device(iface)->api; if (!eth->get_capabilities) { return (enum ethernet_hw_caps)0; diff --git a/include/ptp_clock.h b/include/ptp_clock.h index 803912870d8..0f7ba7e4767 100644 --- a/include/ptp_clock.h +++ b/include/ptp_clock.h @@ -40,7 +40,7 @@ __subsystem struct ptp_clock_driver_api { static inline int ptp_clock_set(struct device *dev, struct net_ptp_time *tm) { const struct ptp_clock_driver_api *api = - (const struct ptp_clock_driver_api *)dev->driver_api; + (const struct ptp_clock_driver_api *)dev->api; return api->set(dev, tm); } @@ -59,7 +59,7 @@ static inline int z_impl_ptp_clock_get(struct device *dev, struct net_ptp_time *tm) { const struct ptp_clock_driver_api *api = - (const struct ptp_clock_driver_api *)dev->driver_api; + (const struct ptp_clock_driver_api *)dev->api; return api->get(dev, tm); } @@ -75,7 +75,7 @@ static inline int z_impl_ptp_clock_get(struct device *dev, static inline int ptp_clock_adjust(struct device *dev, int increment) { const struct ptp_clock_driver_api *api = - (const struct ptp_clock_driver_api *)dev->driver_api; + (const struct ptp_clock_driver_api *)dev->api; return api->adjust(dev, increment); } @@ -91,7 +91,7 @@ static inline int ptp_clock_adjust(struct device *dev, int increment) static inline int ptp_clock_rate_adjust(struct device *dev, float rate) { const struct ptp_clock_driver_api *api = - (const struct ptp_clock_driver_api *)dev->driver_api; + (const struct ptp_clock_driver_api *)dev->api; return api->rate_adjust(dev, rate); } diff --git a/include/shared_irq.h b/include/shared_irq.h index ae2ba647c06..3f7686ba4d4 100644 --- a/include/shared_irq.h +++ b/include/shared_irq.h @@ -60,7 +60,7 @@ static inline int shared_irq_isr_register(struct device *dev, isr_t isr_func, struct device *isr_dev) { const struct shared_irq_driver_api *api = - (const struct shared_irq_driver_api *)dev->driver_api; + (const struct shared_irq_driver_api *)dev->api; return api->isr_register(dev, isr_func, isr_dev); } @@ -73,7 +73,7 @@ static inline int shared_irq_isr_register(struct device *dev, isr_t isr_func, static inline int shared_irq_enable(struct device *dev, struct device *isr_dev) { const struct shared_irq_driver_api *api = - (const struct shared_irq_driver_api *)dev->driver_api; + (const struct shared_irq_driver_api *)dev->api; return api->enable(dev, isr_dev); } @@ -86,7 +86,7 @@ static inline int shared_irq_enable(struct device *dev, struct device *isr_dev) static inline int shared_irq_disable(struct device *dev, struct device *isr_dev) { const struct shared_irq_driver_api *api = - (const struct shared_irq_driver_api *)dev->driver_api; + (const struct shared_irq_driver_api *)dev->api; return api->disable(dev, isr_dev); } diff --git a/include/sys/device_mmio.h b/include/sys/device_mmio.h index db338999aac..e22a161a7d7 100644 --- a/include/sys/device_mmio.h +++ b/include/sys/device_mmio.h @@ -132,7 +132,7 @@ struct z_device_mmio_rom { * This gets accessed by the DEVICE_MMIO_MAP() and DEVICE_MMIO_GET() macros. * * Depending on configuration, no memory may be reserved at all. - * This must be the first member of the driver_data struct. + * This must be the first member of the data struct. * * There must be a corresponding DEVICE_MMIO_ROM in config_info if the * physical address is known at build time, but may be omitted if not (such @@ -170,7 +170,7 @@ struct z_device_mmio_rom { * @param device device instance object * @retval mm_reg_t pointer to storage location */ -#define DEVICE_MMIO_RAM_PTR(device) (mm_reg_t *)((device)->driver_data) +#define DEVICE_MMIO_RAM_PTR(device) (mm_reg_t *)((device)->data) #endif /* DEVICE_MMIO_IS_IN_RAM */ /** @@ -182,7 +182,7 @@ struct z_device_mmio_rom { * * What gets stored here varies considerably by configuration. * This must be the first member of the config struct. There must be - * a corresponding DEVICE_MMIO_RAM in driver_data. + * a corresponding DEVICE_MMIO_RAM in data. * * This storage is not used if the device is PCIe and may be omitted. * diff --git a/include/syscall_handler.h b/include/syscall_handler.h index cd6e0b50c80..e32d27f1580 100644 --- a/include/syscall_handler.h +++ b/include/syscall_handler.h @@ -462,7 +462,7 @@ static inline int z_obj_validation_check(struct z_object *ko, #define Z_SYSCALL_DRIVER_OP(ptr, api_name, op) \ ({ \ struct api_name *__device__ = (struct api_name *) \ - ((struct device *)ptr)->driver_api; \ + ((struct device *)ptr)->api; \ Z_SYSCALL_VERIFY_MSG(__device__->op != NULL, \ "Operation %s not defined for driver " \ "instance %p", \ @@ -491,7 +491,7 @@ static inline int z_obj_validation_check(struct z_object *ko, ({ \ struct device *_dev = (struct device *)_device; \ Z_SYSCALL_OBJ(_dev, _dtype) || \ - Z_SYSCALL_VERIFY_MSG(_dev->driver_api == _api, \ + Z_SYSCALL_VERIFY_MSG(_dev->api == _api, \ "API structure mismatch"); \ }) diff --git a/kernel/device.c b/kernel/device.c index b4fb179f850..400065ad8f7 100644 --- a/kernel/device.c +++ b/kernel/device.c @@ -70,7 +70,7 @@ void z_sys_init_run_level(int32_t level) * so that device_get_binding() will not succeed * for it. */ - dev->driver_api = NULL; + dev->api = NULL; } } } diff --git a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h index 5907e03a519..e0e5b664213 100644 --- a/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h +++ b/samples/application_development/out_of_tree_driver/hello_world_module/zephyr/hello_world_driver.h @@ -33,7 +33,7 @@ __subsystem struct hello_world_driver_api { __syscall void hello_world_print(struct device *dev); static inline void z_impl_hello_world_print(struct device *dev) { - const struct hello_world_driver_api *api = dev->driver_api; + const struct hello_world_driver_api *api = dev->api; __ASSERT(api->print, "Callback pointer should not be NULL"); diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c index 095c6035b2b..ae090976625 100644 --- a/samples/net/wpan_serial/src/main.c +++ b/samples/net/wpan_serial/src/main.c @@ -456,7 +456,7 @@ static bool init_ieee802154(void) return false; } - radio_api = (struct ieee802154_radio_api *)ieee802154_dev->driver_api; + radio_api = (struct ieee802154_radio_api *)ieee802154_dev->api; /** * Do actual initialization of the chip diff --git a/samples/net/wpanusb/src/wpanusb.c b/samples/net/wpanusb/src/wpanusb.c index ab0ae700832..de95f03f86e 100644 --- a/samples/net/wpanusb/src/wpanusb.c +++ b/samples/net/wpanusb/src/wpanusb.c @@ -417,7 +417,7 @@ void main(void) /* Initialize transmit queue */ init_tx_queue(); - radio_api = (struct ieee802154_radio_api *)ieee802154_dev->driver_api; + radio_api = (struct ieee802154_radio_api *)ieee802154_dev->api; ret = usb_enable(NULL); if (ret != 0) { diff --git a/samples/subsys/power/device_pm/src/dummy_driver.c b/samples/subsys/power/device_pm/src/dummy_driver.c index 19485d7513e..edff18f6b32 100644 --- a/samples/subsys/power/device_pm/src/dummy_driver.c +++ b/samples/subsys/power/device_pm/src/dummy_driver.c @@ -59,7 +59,7 @@ static int dummy_read(struct device *dev, uint32_t *val) printk("read()\n"); - api = (struct dummy_parent_api *)parent->driver_api; + api = (struct dummy_parent_api *)parent->api; ret = api->transfer(parent, DUMMY_PARENT_RD, val); return ret; } @@ -70,7 +70,7 @@ static int dummy_write(struct device *dev, uint32_t val) int ret; printk("write()\n"); - api = (struct dummy_parent_api *)parent->driver_api; + api = (struct dummy_parent_api *)parent->api; ret = api->transfer(parent, DUMMY_PARENT_WR, &val); return ret; } diff --git a/samples/subsys/power/device_pm/src/main.c b/samples/subsys/power/device_pm/src/main.c index a0ea6ec3011..9740d1677cb 100644 --- a/samples/subsys/power/device_pm/src/main.c +++ b/samples/subsys/power/device_pm/src/main.c @@ -16,7 +16,7 @@ void main(void) printk("Device PM sample app start\n"); dev = device_get_binding(DUMMY_DRIVER_NAME); - api = (struct dummy_driver_api *)dev->driver_api; + api = (struct dummy_driver_api *)dev->api; ret = api->open(dev); val = 10; ret = api->write(dev, val); diff --git a/samples/userspace/prod_consumer/src/sample_driver.h b/samples/userspace/prod_consumer/src/sample_driver.h index ec7ae867568..0b4169b97b6 100644 --- a/samples/userspace/prod_consumer/src/sample_driver.h +++ b/samples/userspace/prod_consumer/src/sample_driver.h @@ -43,7 +43,7 @@ __syscall int sample_driver_write(struct device *dev, void *buf); static inline int z_impl_sample_driver_write(struct device *dev, void *buf) { - const struct sample_driver_api *api = dev->driver_api; + const struct sample_driver_api *api = dev->api; return api->write(dev, buf); } @@ -59,7 +59,7 @@ __syscall int sample_driver_state_set(struct device *dev, bool active); static inline int z_impl_sample_driver_state_set(struct device *dev, bool active) { - const struct sample_driver_api *api = dev->driver_api; + const struct sample_driver_api *api = dev->api; return api->state_set(dev, active); } @@ -79,7 +79,7 @@ static inline int sample_driver_set_callback(struct device *dev, sample_driver_callback_t cb, void *context) { - const struct sample_driver_api *api = dev->driver_api; + const struct sample_driver_api *api = dev->api; return api->set_callback(dev, cb, context); } diff --git a/samples/userspace/prod_consumer/src/sample_driver_foo.c b/samples/userspace/prod_consumer/src/sample_driver_foo.c index 7da2843ee8a..df190e00fb2 100644 --- a/samples/userspace/prod_consumer/src/sample_driver_foo.c +++ b/samples/userspace/prod_consumer/src/sample_driver_foo.c @@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(sample_driver); */ #define DEV_DATA(dev) \ - ((struct sample_driver_foo_dev_data *const)(dev)->driver_data) + ((struct sample_driver_foo_dev_data *const)(dev)->data) struct sample_driver_foo_dev_data { sample_driver_callback_t cb; diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c index f2e866cc4b2..1741b03627a 100644 --- a/subsys/console/getchar.c +++ b/subsys/console/getchar.c @@ -62,7 +62,7 @@ int console_init(void) /* Checks device driver supports for interrupt driven data transfers. */ if (CONFIG_CONSOLE_GETCHAR_BUFSIZE + CONFIG_CONSOLE_PUTCHAR_BUFSIZE) { const struct uart_driver_api *api = - (const struct uart_driver_api *)uart_dev->driver_api; + (const struct uart_driver_api *)uart_dev->api; if (!api->irq_callback_set) { return -ENOTSUP; } diff --git a/subsys/disk/disk_access_spi_sdhc.c b/subsys/disk/disk_access_spi_sdhc.c index 2873924b52d..d8672e9041a 100644 --- a/subsys/disk/disk_access_spi_sdhc.c +++ b/subsys/disk/disk_access_spi_sdhc.c @@ -764,7 +764,7 @@ static int disk_spi_sdhc_init(struct device *dev); static int sdhc_spi_init(struct device *dev) { - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; data->spi = device_get_binding(DT_BUS_LABEL(DT_INST(0, zephyr_mmc_spi_slot))); @@ -787,7 +787,7 @@ static int sdhc_spi_init(struct device *dev) static int disk_spi_sdhc_access_status(struct disk_info *disk) { struct device *dev = disk->dev; - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; return data->status; } @@ -796,7 +796,7 @@ static int disk_spi_sdhc_access_read(struct disk_info *disk, uint8_t *buf, uint32_t sector, uint32_t count) { struct device *dev = disk->dev; - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; int err; LOG_DBG("sector=%u count=%u", sector, count); @@ -814,7 +814,7 @@ static int disk_spi_sdhc_access_write(struct disk_info *disk, const uint8_t *buf, uint32_t sector, uint32_t count) { struct device *dev = disk->dev; - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; int err; LOG_DBG("sector=%u count=%u", sector, count); @@ -832,7 +832,7 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buf) { struct device *dev = disk->dev; - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; int err; err = sdhc_map_disk_status(data->status); @@ -862,7 +862,7 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk, static int disk_spi_sdhc_access_init(struct disk_info *disk) { struct device *dev = disk->dev; - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; int err; err = sdhc_spi_detect(data); @@ -886,7 +886,7 @@ static struct disk_info spi_sdhc_disk = { static int disk_spi_sdhc_init(struct device *dev) { - struct sdhc_spi_data *data = dev->driver_data; + struct sdhc_spi_data *data = dev->data; data->status = DISK_STATUS_UNINIT; diff --git a/subsys/disk/disk_access_stm32_sdmmc.c b/subsys/disk/disk_access_stm32_sdmmc.c index 187a2923d6a..15ed86c77f9 100644 --- a/subsys/disk/disk_access_stm32_sdmmc.c +++ b/subsys/disk/disk_access_stm32_sdmmc.c @@ -85,7 +85,7 @@ static int stm32_sdmmc_clock_disable(struct stm32_sdmmc_priv *priv) static int stm32_sdmmc_access_init(struct disk_info *disk) { struct device *dev = disk->dev; - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; int err; if (priv->status == DISK_STATUS_OK) { @@ -121,7 +121,7 @@ static void stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv) static int stm32_sdmmc_access_status(struct disk_info *disk) { struct device *dev = disk->dev; - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; return priv->status; } @@ -130,7 +130,7 @@ static int stm32_sdmmc_access_read(struct disk_info *disk, uint8_t *data_buf, uint32_t start_sector, uint32_t num_sector) { struct device *dev = disk->dev; - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; int err; err = HAL_SD_ReadBlocks(&priv->hsd, data_buf, start_sector, @@ -151,7 +151,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk, uint32_t start_sector, uint32_t num_sector) { struct device *dev = disk->dev; - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; int err; err = HAL_SD_WriteBlocks(&priv->hsd, (uint8_t *)data_buf, start_sector, @@ -170,7 +170,7 @@ static int stm32_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buff) { struct device *dev = disk->dev; - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; HAL_SD_CardInfoTypeDef info; int err; @@ -352,7 +352,7 @@ static int stm32_sdmmc_pwr_uninit(struct stm32_sdmmc_priv *priv) static int disk_stm32_sdmmc_init(struct device *dev) { - struct stm32_sdmmc_priv *priv = dev->driver_data; + struct stm32_sdmmc_priv *priv = dev->data; int err; k_work_init(&priv->work, stm32_sdmmc_cd_handler); diff --git a/subsys/disk/disk_access_usdhc.c b/subsys/disk/disk_access_usdhc.c index 9e57b620493..a9fbf760dc8 100644 --- a/subsys/disk/disk_access_usdhc.c +++ b/subsys/disk/disk_access_usdhc.c @@ -2659,7 +2659,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; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; int ret; (void)k_mutex_lock(&z_usdhc_init_lock, K_FOREVER); @@ -2709,7 +2709,7 @@ static int usdhc_access_init(const struct device *dev) static int disk_usdhc_access_status(struct disk_info *disk) { struct device *dev = disk->dev; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; return priv->status; } @@ -2718,7 +2718,7 @@ static int disk_usdhc_access_read(struct disk_info *disk, uint8_t *buf, uint32_t sector, uint32_t count) { struct device *dev = disk->dev; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; LOG_DBG("sector=%u count=%u", sector, count); @@ -2729,7 +2729,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const uint8_t *buf, uint32_t sector, uint32_t count) { struct device *dev = disk->dev; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; LOG_DBG("sector=%u count=%u", sector, count); @@ -2739,7 +2739,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const uint8_t *buf, static int disk_usdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buf) { struct device *dev = disk->dev; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; int err; err = sdhc_map_disk_status(priv->status); @@ -2769,7 +2769,7 @@ static int disk_usdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *bu static int disk_usdhc_access_init(struct disk_info *disk) { struct device *dev = disk->dev; - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; if (priv->status == DISK_STATUS_OK) { /* Called twice, don't re-init. */ @@ -2794,7 +2794,7 @@ static struct disk_info usdhc_disk = { static int disk_usdhc_init(struct device *dev) { - struct usdhc_priv *priv = dev->driver_data; + struct usdhc_priv *priv = dev->data; priv->status = DISK_STATUS_UNINIT; diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c index 87e82957254..aa196f33b3c 100644 --- a/subsys/fb/cfb.c +++ b/subsys/fb/cfb.c @@ -193,7 +193,7 @@ int cfb_framebuffer_invert(struct device *dev) int cfb_framebuffer_finalize(struct device *dev) { - const struct display_driver_api *api = dev->driver_api; + const struct display_driver_api *api = dev->api; const struct char_framebuffer *fb = &char_fb; struct display_buffer_descriptor desc; @@ -280,7 +280,7 @@ int cfb_get_numof_fonts(struct device *dev) int cfb_framebuffer_init(struct device *dev) { - const struct display_driver_api *api = dev->driver_api; + const struct display_driver_api *api = dev->api; struct char_framebuffer *fb = &char_fb; struct display_capabilities cfg; diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c index 269437b396b..f77c6c48852 100644 --- a/subsys/net/ip/net_if.c +++ b/subsys/net/ip/net_if.c @@ -413,7 +413,7 @@ void net_if_stats_reset_all(void) static inline void init_iface(struct net_if *iface) { - const struct net_if_api *api = net_if_get_device(iface)->driver_api; + const struct net_if_api *api = net_if_get_device(iface)->api; if (!api || !api->init) { NET_ERR("Iface %p driver API init NULL", iface); diff --git a/subsys/net/l2/bluetooth/bluetooth.c b/subsys/net/l2/bluetooth/bluetooth.c index 6c1225079c1..46678a7b4aa 100644 --- a/subsys/net/l2/bluetooth/bluetooth.c +++ b/subsys/net/l2/bluetooth/bluetooth.c @@ -74,7 +74,7 @@ static enum net_verdict net_bt_recv(struct net_if *iface, struct net_pkt *pkt) static struct bt_if_conn *net_bt_get_conn(struct net_if *iface) { - struct bt_context *ctxt = net_if_get_device(iface)->driver_data; + struct bt_context *ctxt = net_if_get_device(iface)->data; int i; for (i = 0; i < CONFIG_BT_MAX_CONN; i++) { @@ -272,7 +272,7 @@ static struct bt_context bt_context_data = { static void bt_iface_init(struct net_if *iface) { - struct bt_context *ctxt = net_if_get_device(iface)->driver_data; + struct bt_context *ctxt = net_if_get_device(iface)->data; struct bt_if_conn *conn = NULL; int i; @@ -604,7 +604,7 @@ static struct bt_conn_cb conn_callbacks = { static int net_bt_init(struct device *dev) { - NET_DBG("dev %p driver_data %p", dev, dev->driver_data); + NET_DBG("dev %p driver_data %p", dev, dev->data); #if defined(CONFIG_NET_L2_BT_MGMT) bt_conn_cb_register(&conn_callbacks); diff --git a/subsys/net/l2/canbus/6locan.c b/subsys/net/l2/canbus/6locan.c index d6960218148..ca7600cdde1 100644 --- a/subsys/net/l2/canbus/6locan.c +++ b/subsys/net/l2/canbus/6locan.c @@ -430,7 +430,7 @@ static int canbus_send_fc(struct device *net_can_dev, struct net_canbus_lladdr *dest, struct net_canbus_lladdr *src, uint8_t fs) { - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_frame frame = { .id_type = CAN_EXTENDED_IDENTIFIER, .rtr = CAN_DATAFRAME, @@ -699,7 +699,7 @@ static inline int canbus_send_cf(struct net_pkt *pkt) { struct canbus_isotp_tx_ctx *ctx = pkt->canbus_tx_ctx; struct device *net_can_dev = net_if_get_device(pkt->iface); - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_frame frame; struct net_pkt_cursor cursor_backup; int ret, len; @@ -874,7 +874,7 @@ static inline int canbus_send_ff(struct net_pkt *pkt, size_t len, bool mcast, struct net_canbus_lladdr *dest_addr) { struct device *net_can_dev = net_if_get_device(pkt->iface); - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct net_linkaddr *lladdr_inline; struct zcan_frame frame; int ret, index = 0; @@ -944,7 +944,7 @@ static inline int canbus_send_single_frame(struct net_pkt *pkt, size_t len, struct net_canbus_lladdr *dest_addr) { struct device *net_can_dev = net_if_get_device(pkt->iface); - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; int index = 0; struct zcan_frame frame; struct net_linkaddr *lladdr_dest; @@ -1499,7 +1499,7 @@ static enum net_verdict canbus_recv(struct net_if *iface, static inline int canbus_send_dad_request(struct device *net_can_dev, struct net_canbus_lladdr *ll_addr) { - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_frame frame; int ret; @@ -1543,7 +1543,7 @@ static inline void canbus_send_dad_response(struct k_work *item) struct net_if *iface = ctx->iface; struct net_linkaddr *ll_addr = net_if_get_link_addr(iface); struct device *net_can_dev = net_if_get_device(iface); - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_frame frame; int ret; @@ -1565,7 +1565,7 @@ static inline void canbus_send_dad_response(struct k_work *item) static inline void canbus_detach_filter(struct device *net_can_dev, int filter_id) { - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; api->detach_filter(net_can_dev, filter_id); } @@ -1582,7 +1582,7 @@ int canbus_attach_dad_resp_filter(struct device *net_can_dev, struct net_canbus_lladdr *ll_addr, struct k_sem *dad_sem) { - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_filter filter = { .id_type = CAN_EXTENDED_IDENTIFIER, .rtr = CAN_DATAFRAME, @@ -1613,7 +1613,7 @@ static inline int canbus_attach_dad_filter(struct device *net_can_dev, struct net_canbus_lladdr *ll_addr, struct k_work *dad_work) { - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct zcan_filter filter = { .id_type = CAN_EXTENDED_IDENTIFIER, .rtr = CAN_REMOTEREQUEST, @@ -1744,7 +1744,7 @@ void net_6locan_init(struct net_if *iface) static int canbus_enable(struct net_if *iface, bool state) { struct device *net_can_dev = net_if_get_device(iface); - const struct net_can_api *api = net_can_dev->driver_api; + const struct net_can_api *api = net_can_dev->api; struct canbus_net_ctx *ctx = net_if_l2_data(iface); int dad_retry_cnt, ret; diff --git a/subsys/net/l2/canbus/canbus_raw.c b/subsys/net/l2/canbus/canbus_raw.c index 6a1b94bab86..3a947422048 100644 --- a/subsys/net/l2/canbus/canbus_raw.c +++ b/subsys/net/l2/canbus/canbus_raw.c @@ -30,7 +30,7 @@ static inline enum net_verdict canbus_recv(struct net_if *iface, static inline int canbus_send(struct net_if *iface, struct net_pkt *pkt) { - const struct canbus_api *api = net_if_get_device(iface)->driver_api; + const struct canbus_api *api = net_if_get_device(iface)->api; int ret; if (!api) { diff --git a/subsys/net/l2/dummy/dummy.c b/subsys/net/l2/dummy/dummy.c index 3fbc30fa390..9e66f30f560 100644 --- a/subsys/net/l2/dummy/dummy.c +++ b/subsys/net/l2/dummy/dummy.c @@ -29,7 +29,7 @@ static inline enum net_verdict dummy_recv(struct net_if *iface, static inline int dummy_send(struct net_if *iface, struct net_pkt *pkt) { - const struct dummy_api *api = net_if_get_device(iface)->driver_api; + const struct dummy_api *api = net_if_get_device(iface)->api; int ret; if (!api) { diff --git a/subsys/net/l2/ethernet/eth_stats.h b/subsys/net/l2/ethernet/eth_stats.h index 2fe897c1e2e..ec28a79ea4d 100644 --- a/subsys/net/l2/ethernet/eth_stats.h +++ b/subsys/net/l2/ethernet/eth_stats.h @@ -17,7 +17,7 @@ static inline void eth_stats_update_bytes_rx(struct net_if *iface, uint32_t bytes) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -36,7 +36,7 @@ static inline void eth_stats_update_bytes_tx(struct net_if *iface, uint32_t bytes) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -54,7 +54,7 @@ static inline void eth_stats_update_bytes_tx(struct net_if *iface, static inline void eth_stats_update_pkts_rx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -72,7 +72,7 @@ static inline void eth_stats_update_pkts_rx(struct net_if *iface) static inline void eth_stats_update_pkts_tx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -90,7 +90,7 @@ static inline void eth_stats_update_pkts_tx(struct net_if *iface) static inline void eth_stats_update_broadcast_rx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -108,7 +108,7 @@ static inline void eth_stats_update_broadcast_rx(struct net_if *iface) static inline void eth_stats_update_broadcast_tx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -126,7 +126,7 @@ static inline void eth_stats_update_broadcast_tx(struct net_if *iface) static inline void eth_stats_update_multicast_rx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -144,7 +144,7 @@ static inline void eth_stats_update_multicast_rx(struct net_if *iface) static inline void eth_stats_update_multicast_tx(struct net_if *iface) { const struct ethernet_api *api = (const struct ethernet_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_eth *stats; if (!api->get_stats) { @@ -170,7 +170,7 @@ static inline void eth_stats_update_errors_rx(struct net_if *iface) } api = ((const struct ethernet_api *) - net_if_get_device(iface)->driver_api); + net_if_get_device(iface)->api); if (!api->get_stats) { return; @@ -188,7 +188,7 @@ static inline void eth_stats_update_errors_tx(struct net_if *iface) { struct net_stats_eth *stats; const struct ethernet_api *api = ((const struct ethernet_api *) - net_if_get_device(iface)->driver_api); + net_if_get_device(iface)->api); if (!api->get_stats) { return; diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c index 572f024b9d7..2b2080cb373 100644 --- a/subsys/net/l2/ethernet/ethernet.c +++ b/subsys/net/l2/ethernet/ethernet.c @@ -146,7 +146,7 @@ static void ethernet_update_rx_stats(struct net_if *iface, static inline bool eth_is_vlan_tag_stripped(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - const struct ethernet_api *api = dev->driver_api; + const struct ethernet_api *api = dev->api; return (api->get_capabilities(dev) & ETHERNET_HW_VLAN_TAG_STRIP); } @@ -557,7 +557,7 @@ static void ethernet_remove_l2_header(struct net_pkt *pkt) static int ethernet_send(struct net_if *iface, struct net_pkt *pkt) { - const struct ethernet_api *api = net_if_get_device(iface)->driver_api; + const struct ethernet_api *api = net_if_get_device(iface)->api; struct ethernet_context *ctx = net_if_l2_data(iface); uint16_t ptype; int ret; @@ -658,7 +658,7 @@ error: static inline int ethernet_enable(struct net_if *iface, bool state) { const struct ethernet_api *eth = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!eth) { return -ENOENT; @@ -853,7 +853,7 @@ int net_eth_vlan_enable(struct net_if *iface, uint16_t tag) { struct ethernet_context *ctx = net_if_l2_data(iface); const struct ethernet_api *eth = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct ethernet_vlan *vlan; int i; @@ -926,7 +926,7 @@ int net_eth_vlan_disable(struct net_if *iface, uint16_t tag) { struct ethernet_context *ctx = net_if_l2_data(iface); const struct ethernet_api *eth = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct ethernet_vlan *vlan; if (!eth) { @@ -1025,7 +1025,7 @@ void net_eth_carrier_off(struct net_if *iface) struct device *net_eth_get_ptp_clock(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - const struct ethernet_api *api = dev->driver_api; + const struct ethernet_api *api = dev->api; if (!api) { return NULL; diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c index 1bb06d4d771..978f7f119a3 100644 --- a/subsys/net/l2/ethernet/ethernet_mgmt.c +++ b/subsys/net/l2/ethernet/ethernet_mgmt.c @@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(net_ethernet_mgmt, CONFIG_NET_L2_ETHERNET_LOG_LEVEL); static inline bool is_hw_caps_supported(struct device *dev, enum ethernet_hw_caps caps) { - const struct ethernet_api *api = dev->driver_api; + const struct ethernet_api *api = dev->api; if (!api) { return false; @@ -31,7 +31,7 @@ static int ethernet_set_config(uint32_t mgmt_request, { struct ethernet_req_params *params = (struct ethernet_req_params *)data; struct device *dev = net_if_get_device(iface); - const struct ethernet_api *api = dev->driver_api; + const struct ethernet_api *api = dev->api; struct ethernet_config config = { 0 }; enum ethernet_config_type type; @@ -177,7 +177,7 @@ static int ethernet_get_config(uint32_t mgmt_request, { struct ethernet_req_params *params = (struct ethernet_req_params *)data; struct device *dev = net_if_get_device(iface); - const struct ethernet_api *api = dev->driver_api; + const struct ethernet_api *api = dev->api; struct ethernet_config config = { 0 }; int ret = 0; enum ethernet_config_type type; diff --git a/subsys/net/l2/ethernet/ethernet_stats.c b/subsys/net/l2/ethernet/ethernet_stats.c index c26aa5c1b9f..39336f32d77 100644 --- a/subsys/net/l2/ethernet/ethernet_stats.c +++ b/subsys/net/l2/ethernet/ethernet_stats.c @@ -30,7 +30,7 @@ static int eth_stats_get(uint32_t mgmt_request, struct net_if *iface, return -ENOENT; } - eth = net_if_get_device(iface)->driver_api; + eth = net_if_get_device(iface)->api; if (eth == NULL || eth->get_stats == NULL) { return -ENOENT; } diff --git a/subsys/net/l2/ieee802154/ieee802154_utils.h b/subsys/net/l2/ieee802154/ieee802154_utils.h index f00b643695a..b34c10bdfaa 100644 --- a/subsys/net/l2/ieee802154/ieee802154_utils.h +++ b/subsys/net/l2/ieee802154/ieee802154_utils.h @@ -18,7 +18,7 @@ static inline enum ieee802154_hw_caps ieee802154_get_hw_capabilities(struct net_if *iface) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return 0; @@ -30,7 +30,7 @@ enum ieee802154_hw_caps ieee802154_get_hw_capabilities(struct net_if *iface) static inline int ieee802154_cca(struct net_if *iface) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -42,7 +42,7 @@ static inline int ieee802154_cca(struct net_if *iface) static inline int ieee802154_set_channel(struct net_if *iface, uint16_t channel) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -54,7 +54,7 @@ static inline int ieee802154_set_channel(struct net_if *iface, uint16_t channel) static inline int ieee802154_set_tx_power(struct net_if *iface, int16_t dbm) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -69,7 +69,7 @@ static inline int ieee802154_tx(struct net_if *iface, struct net_buf *buf) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -81,7 +81,7 @@ static inline int ieee802154_tx(struct net_if *iface, static inline int ieee802154_start(struct net_if *iface) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -93,7 +93,7 @@ static inline int ieee802154_start(struct net_if *iface) static inline int ieee802154_stop(struct net_if *iface) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return -ENOENT; @@ -106,7 +106,7 @@ static inline void ieee802154_filter_ieee_addr(struct net_if *iface, uint8_t *ieee_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -126,7 +126,7 @@ static inline void ieee802154_filter_short_addr(struct net_if *iface, uint16_t short_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -146,7 +146,7 @@ static inline void ieee802154_filter_pan_id(struct net_if *iface, uint16_t pan_id) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -166,7 +166,7 @@ static inline void ieee802154_filter_src_ieee_addr(struct net_if *iface, uint8_t *ieee_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -186,7 +186,7 @@ static inline void ieee802154_filter_src_short_addr(struct net_if *iface, uint16_t short_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -206,7 +206,7 @@ static inline void ieee802154_remove_src_ieee_addr(struct net_if *iface, uint8_t *ieee_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -226,7 +226,7 @@ static inline void ieee802154_remove_src_short_addr(struct net_if *iface, uint16_t short_addr) { const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (radio && (radio->get_capabilities(net_if_get_device(iface)) & IEEE802154_HW_FILTER)) { @@ -251,7 +251,7 @@ static inline bool ieee802154_verify_channel(struct net_if *iface, #ifdef CONFIG_NET_L2_IEEE802154_SUB_GHZ const struct ieee802154_radio_api *radio = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; if (!radio) { return false; diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c index 67cd95ec1ba..2764e396ff3 100644 --- a/subsys/net/l2/ppp/ppp_l2.c +++ b/subsys/net/l2/ppp/ppp_l2.c @@ -150,7 +150,7 @@ static enum net_verdict ppp_recv(struct net_if *iface, static int ppp_send(struct net_if *iface, struct net_pkt *pkt) { - const struct ppp_api *api = net_if_get_device(iface)->driver_api; + const struct ppp_api *api = net_if_get_device(iface)->api; struct ppp_context *ctx = net_if_l2_data(iface); int ret; @@ -204,7 +204,7 @@ static void start_ppp(struct ppp_context *ctx) static int ppp_enable(struct net_if *iface, bool state) { const struct ppp_api *ppp = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct ppp_context *ctx = net_if_l2_data(iface); diff --git a/subsys/net/l2/ppp/ppp_stats.c b/subsys/net/l2/ppp/ppp_stats.c index 45f41241d6b..3f0dfaad653 100644 --- a/subsys/net/l2/ppp/ppp_stats.c +++ b/subsys/net/l2/ppp/ppp_stats.c @@ -30,7 +30,7 @@ static int ppp_stats_get(uint32_t mgmt_request, struct net_if *iface, return -ENOENT; } - ppp = net_if_get_device(iface)->driver_api; + ppp = net_if_get_device(iface)->api; if (ppp->get_stats == NULL) { return -ENOENT; } diff --git a/subsys/net/l2/ppp/ppp_stats.h b/subsys/net/l2/ppp/ppp_stats.h index a13de481aa1..c80572bbe3f 100644 --- a/subsys/net/l2/ppp/ppp_stats.h +++ b/subsys/net/l2/ppp/ppp_stats.h @@ -17,7 +17,7 @@ static inline void ppp_stats_update_bytes_rx(struct net_if *iface, uint32_t bytes) { const struct ppp_api *api = (const struct ppp_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_ppp *stats; if (!api->get_stats) { @@ -36,7 +36,7 @@ static inline void ppp_stats_update_bytes_tx(struct net_if *iface, uint32_t bytes) { const struct ppp_api *api = (const struct ppp_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_ppp *stats; if (!api->get_stats) { @@ -54,7 +54,7 @@ static inline void ppp_stats_update_bytes_tx(struct net_if *iface, static inline void ppp_stats_update_pkts_rx(struct net_if *iface) { const struct ppp_api *api = (const struct ppp_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_ppp *stats; if (!api->get_stats) { @@ -72,7 +72,7 @@ static inline void ppp_stats_update_pkts_rx(struct net_if *iface) static inline void ppp_stats_update_pkts_tx(struct net_if *iface) { const struct ppp_api *api = (const struct ppp_api *) - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; struct net_stats_ppp *stats; if (!api->get_stats) { @@ -90,7 +90,7 @@ static inline void ppp_stats_update_pkts_tx(struct net_if *iface) static inline void ppp_stats_update_drop_rx(struct net_if *iface) { const struct ppp_api *api = ((const struct ppp_api *) - net_if_get_device(iface)->driver_api); + net_if_get_device(iface)->api); struct net_stats_ppp *stats; if (!api->get_stats) { @@ -108,7 +108,7 @@ static inline void ppp_stats_update_drop_rx(struct net_if *iface) static inline void ppp_stats_update_fcs_error_rx(struct net_if *iface) { const struct ppp_api *api = ((const struct ppp_api *) - net_if_get_device(iface)->driver_api); + net_if_get_device(iface)->api); struct net_stats_ppp *stats; if (!api->get_stats) { diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c index 011b49464d3..58edd9eb988 100644 --- a/subsys/net/l2/wifi/wifi_mgmt.c +++ b/subsys/net/l2/wifi/wifi_mgmt.c @@ -20,7 +20,7 @@ static int wifi_connect(uint32_t mgmt_request, struct net_if *iface, (struct wifi_connect_req_params *)data; struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = - (struct net_wifi_mgmt_offload *) dev->driver_api; + (struct net_wifi_mgmt_offload *) dev->api; if (off_api == NULL || off_api->connect == NULL) { return -ENOTSUP; @@ -74,7 +74,7 @@ static int wifi_scan(uint32_t mgmt_request, struct net_if *iface, { struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = - (struct net_wifi_mgmt_offload *) dev->driver_api; + (struct net_wifi_mgmt_offload *) dev->api; if (off_api == NULL || off_api->scan == NULL) { return -ENOTSUP; @@ -91,7 +91,7 @@ static int wifi_disconnect(uint32_t mgmt_request, struct net_if *iface, { struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = - (struct net_wifi_mgmt_offload *) dev->driver_api; + (struct net_wifi_mgmt_offload *) dev->api; if (off_api == NULL || off_api->disconnect == NULL) { return -ENOTSUP; @@ -131,7 +131,7 @@ static int wifi_ap_enable(uint32_t mgmt_request, struct net_if *iface, (struct wifi_connect_req_params *)data; struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = - (struct net_wifi_mgmt_offload *) dev->driver_api; + (struct net_wifi_mgmt_offload *) dev->api; if (off_api == NULL || off_api->ap_enable == NULL) { return -ENOTSUP; @@ -147,7 +147,7 @@ static int wifi_ap_disable(uint32_t mgmt_request, struct net_if *iface, { struct device *dev = net_if_get_device(iface); struct net_wifi_mgmt_offload *off_api = - (struct net_wifi_mgmt_offload *) dev->driver_api; + (struct net_wifi_mgmt_offload *) dev->api; if (off_api == NULL || off_api->ap_enable == NULL) { return -ENOTSUP; diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c index 412cd81b3f7..b42380bf50e 100644 --- a/subsys/net/lib/openthread/platform/radio.c +++ b/subsys/net/lib/openthread/platform/radio.c @@ -189,7 +189,7 @@ void platformRadioInit(void) radio_dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME); __ASSERT_NO_MSG(radio_dev != NULL); - radio_api = (struct ieee802154_radio_api *)radio_dev->driver_api; + radio_api = (struct ieee802154_radio_api *)radio_dev->api; if (!radio_api) { return; } diff --git a/subsys/net/lib/sockets/sockets_can.c b/subsys/net/lib/sockets/sockets_can.c index e549bd73eb4..fcb9818a08f 100644 --- a/subsys/net/lib/sockets/sockets_can.c +++ b/subsys/net/lib/sockets/sockets_can.c @@ -364,7 +364,7 @@ static int close_socket(struct net_context *ctx) iface = net_context_get_iface(ctx); dev = net_if_get_device(iface); - api = dev->driver_api; + api = dev->api; if (!api || !api->close) { return -ENOTSUP; @@ -484,7 +484,7 @@ static int can_sock_getsockopt_vmeth(void *obj, int level, int optname, iface = net_context_get_iface(obj); dev = net_if_get_device(iface); - api = dev->driver_api; + api = dev->api; if (!api || !api->getsockopt) { errno = ENOTSUP; @@ -606,7 +606,7 @@ static int can_sock_setsockopt_vmeth(void *obj, int level, int optname, iface = net_context_get_iface(obj); dev = net_if_get_device(iface); - api = dev->driver_api; + api = dev->api; if (!api || !api->setsockopt) { errno = ENOTSUP; diff --git a/subsys/storage/stream/stream_flash.c b/subsys/storage/stream/stream_flash.c index 49f99391229..40f4bddc528 100644 --- a/subsys/storage/stream/stream_flash.c +++ b/subsys/storage/stream/stream_flash.c @@ -192,7 +192,7 @@ int stream_flash_init(struct stream_flash_ctx *ctx, struct device *fdev, size_t layout_size = 0; size_t total_size = 0; const struct flash_pages_layout *layout; - const struct flash_driver_api *api = fdev->driver_api; + const struct flash_driver_api *api = fdev->api; if (buf_len % flash_get_write_block_size(fdev)) { LOG_ERR("Buffer size is not aligned to minimal write-block-size"); diff --git a/subsys/usb/class/audio/audio.c b/subsys/usb/class/audio/audio.c index 8d44f2cddeb..885061b72fa 100644 --- a/subsys/usb/class/audio/audio.c +++ b/subsys/usb/class/audio/audio.c @@ -788,7 +788,7 @@ static void audio_write_cb(uint8_t ep, int size, void *priv) struct net_buf *buffer = priv; dev_data = usb_get_dev_data_by_ep(&usb_audio_data_devlist, ep); - audio_dev_data = dev_data->dev->driver_data; + audio_dev_data = dev_data->dev->data; LOG_DBG("Written %d bytes on ep 0x%02x, *audio_dev_data %p", size, ep, audio_dev_data); @@ -809,7 +809,7 @@ static void audio_write_cb(uint8_t ep, int size, void *priv) 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_audio_dev_data *audio_dev_data = dev->data; 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; @@ -839,7 +839,7 @@ int usb_audio_send(const struct device *dev, struct net_buf *buffer, size_t usb_audio_get_in_frame_size(const struct device *dev) { - struct usb_audio_dev_data *audio_dev_data = dev->driver_data; + struct usb_audio_dev_data *audio_dev_data = dev->data; return audio_dev_data->in_frame_size; } @@ -899,7 +899,7 @@ static void audio_receive_cb(uint8_t ep, enum usb_dc_ep_cb_status_code status) void usb_audio_register(struct device *dev, const struct usb_audio_ops *ops) { - struct usb_audio_dev_data *audio_dev_data = dev->driver_data; + struct usb_audio_dev_data *audio_dev_data = dev->data; const struct usb_cfg_data *cfg = dev->config; const struct std_if_descriptor *iface_descr = cfg->interface_descriptor; diff --git a/subsys/usb/class/cdc_acm.c b/subsys/usb/class/cdc_acm.c index 9d495acae01..f97741d8632 100644 --- a/subsys/usb/class/cdc_acm.c +++ b/subsys/usb/class/cdc_acm.c @@ -60,7 +60,7 @@ LOG_MODULE_REGISTER(usb_cdc_acm); #define DEV_DATA(dev) \ - ((struct cdc_acm_dev_data_t * const)(dev)->driver_data) + ((struct cdc_acm_dev_data_t * const)(dev)->data) /* 115200bps, no parity, 1 stop bit, 8bit char */ #define CDC_ACM_DEFAULT_BAUDRATE {sys_cpu_to_le32(115200), 0, 0, 8} @@ -770,7 +770,7 @@ int cdc_acm_dte_rate_callback_set(struct device *dev, { struct cdc_acm_dev_data_t *const dev_data = DEV_DATA(dev); - if (dev->driver_api != &cdc_acm_driver_api) { + if (dev->api != &cdc_acm_driver_api) { return -EINVAL; } diff --git a/subsys/usb/class/hid/core.c b/subsys/usb/class/hid/core.c index 78544acddfc..c5a97fcfb49 100644 --- a/subsys/usb/class/hid/core.c +++ b/subsys/usb/class/hid/core.c @@ -647,7 +647,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; - struct hid_device_info *dev_data = dev->driver_data; + struct hid_device_info *dev_data = dev->data; LOG_DBG("Initializing HID Device: dev %p", dev); @@ -662,7 +662,7 @@ int usb_hid_init(const struct device *dev) void usb_hid_register_device(struct device *dev, const uint8_t *desc, size_t size, const struct hid_ops *ops) { - struct hid_device_info *dev_data = dev->driver_data; + struct hid_device_info *dev_data = dev->data; dev_data->report_desc = desc; dev_data->report_size = size; diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c index 942b0759109..456b84f9425 100644 --- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c +++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c @@ -15,7 +15,7 @@ #include LOG_MODULE_DECLARE(main); -#define DEV_DATA(dev) ((struct i2c_virtual_data * const)(dev)->driver_data) +#define DEV_DATA(dev) ((struct i2c_virtual_data * const)(dev)->data) struct i2c_virtual_data { sys_slist_t slaves; diff --git a/tests/drivers/ipm/src/ipm_dummy.c b/tests/drivers/ipm/src/ipm_dummy.c index dd5dccd1745..3b2896a7327 100644 --- a/tests/drivers/ipm/src/ipm_dummy.c +++ b/tests/drivers/ipm/src/ipm_dummy.c @@ -24,7 +24,7 @@ static void ipm_dummy_isr(void *data) { struct device *d = (struct device *)data; - struct ipm_dummy_driver_data *driver_data = d->driver_data; + struct ipm_dummy_driver_data *driver_data = d->data; /* In a real driver the interrupt simply wouldn't fire, we fake * that here @@ -52,7 +52,7 @@ static int ipm_dummy_send(struct device *d, int wait, uint32_t id, const uint8_t *data8; int i; - driver_data = d->driver_data; + driver_data = d->data; if (size > ipm_max_data_size_get(d)) { return -EMSGSIZE; } @@ -85,14 +85,14 @@ static void ipm_dummy_register_callback(struct device *d, ipm_callback_t cb, { struct ipm_dummy_driver_data *driver_data; - driver_data = d->driver_data; + driver_data = d->data; driver_data->cb = cb; driver_data->cb_context = cb_context; } static int ipm_dummy_set_enabled(struct device *d, int enable) { - struct ipm_dummy_driver_data *driver_data = d->driver_data; + struct ipm_dummy_driver_data *driver_data = d->data; driver_data->regs.enabled = enable; if (enable) { @@ -128,7 +128,7 @@ int ipm_dummy_init(struct device *d) { struct ipm_dummy_driver_data *driver_data; - driver_data = d->driver_data; + driver_data = d->data; return 0; } diff --git a/tests/drivers/sensor/src/dummy_sensor.c b/tests/drivers/sensor/src/dummy_sensor.c index 642bed5fe33..19e0d143f3f 100644 --- a/tests/drivers/sensor/src/dummy_sensor.c +++ b/tests/drivers/sensor/src/dummy_sensor.c @@ -33,7 +33,7 @@ static int dummy_sensor_channel_get(struct device *dev, enum sensor_channel chan, struct sensor_value *val) { - struct dummy_sensor_data *data = dev->driver_data; + struct dummy_sensor_data *data = dev->data; switch (chan) { case SENSOR_CHAN_LIGHT: @@ -73,7 +73,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; + struct dummy_sensor_data *data = dev->data; const struct dummy_sensor_config *config = dev->config; /* i2c should be null for dummy driver */ struct device *i2c = device_get_binding(config->i2c_name); @@ -102,7 +102,7 @@ int dummy_sensor_attr_set(struct device *dev, enum sensor_attribute attr, const struct sensor_value *val) { - struct dummy_sensor_data *data = dev->driver_data; + struct dummy_sensor_data *data = dev->data; if (chan == SENSOR_CHAN_PROX && attr == SENSOR_ATTR_UPPER_THRESH) { @@ -119,7 +119,7 @@ int dummy_sensor_attr_get(struct device *dev, enum sensor_attribute attr, struct sensor_value *val) { - struct dummy_sensor_data *data = dev->driver_data; + struct dummy_sensor_data *data = dev->data; if (chan == SENSOR_CHAN_PROX && attr == SENSOR_ATTR_UPPER_THRESH) { @@ -135,7 +135,7 @@ int dummy_sensor_trigger_set(struct device *dev, const struct sensor_trigger *trig, sensor_trigger_handler_t handler) { - struct dummy_sensor_data *data = dev->driver_data; + struct dummy_sensor_data *data = dev->data; switch (trig->type) { case SENSOR_TRIG_THRESHOLD: diff --git a/tests/kernel/device/src/abstract_driver.h b/tests/kernel/device/src/abstract_driver.h index 8d68c062c7d..1b471a3859a 100644 --- a/tests/kernel/device/src/abstract_driver.h +++ b/tests/kernel/device/src/abstract_driver.h @@ -20,7 +20,7 @@ static inline int subsystem_do_this(struct device *device, int foo, int bar) { struct subsystem_api *api; - api = (struct subsystem_api *)device->driver_api; + api = (struct subsystem_api *)device->api; return api->do_this(device, foo, bar); } @@ -28,6 +28,6 @@ static inline void subsystem_do_that(struct device *device, unsigned int *baz) { struct subsystem_api *api; - api = (struct subsystem_api *)device->driver_api; + api = (struct subsystem_api *)device->api; api->do_that(device, baz); } diff --git a/tests/kernel/device/src/mmio.c b/tests/kernel/device/src/mmio.c index b7a099c9d9c..9f84fa7fc06 100644 --- a/tests/kernel/device/src/mmio.c +++ b/tests/kernel/device/src/mmio.c @@ -118,7 +118,7 @@ const struct foo_mult_config_info foo12_config = { DEVICE_MMIO_NAMED_ROM_INIT(grault, 2) }; -#define DEV_DATA(dev) ((struct foo_mult_dev_data *)((dev)->driver_data)) +#define DEV_DATA(dev) ((struct foo_mult_dev_data *)((dev)->data)) #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 2dcfc40258e..81e58219b77 100644 --- a/tests/lib/devicetree/api/src/main.c +++ b/tests/lib/devicetree/api/src/main.c @@ -1267,7 +1267,7 @@ struct test_gpio_data { static int test_gpio_init(struct device *dev) { - struct test_gpio_data *data = dev->driver_data; + struct test_gpio_data *data = dev->data; data->init_called = 1; return 0; @@ -1301,7 +1301,7 @@ DT_INST_FOREACH_STATUS_OKAY(TEST_GPIO_INIT) static inline struct test_gpio_data *to_data(struct device *dev) { - return (struct test_gpio_data *)dev->driver_data; + return (struct test_gpio_data *)dev->data; } static inline const struct test_gpio_info *to_info(struct device *dev) diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c index 03ae1542b8f..c37c1bd3c6c 100644 --- a/tests/net/6lo/src/main.c +++ b/tests/net/6lo/src/main.c @@ -247,7 +247,7 @@ struct net_6lo_data { int net_6lo_dev_init(struct device *dev) { - struct net_6lo_context *net_6lo_context = dev->driver_data; + struct net_6lo_context *net_6lo_context = dev->data; net_6lo_context = net_6lo_context; diff --git a/tests/net/arp/src/main.c b/tests/net/arp/src/main.c index 82c7342879e..1da4d07d34c 100644 --- a/tests/net/arp/src/main.c +++ b/tests/net/arp/src/main.c @@ -52,7 +52,7 @@ struct net_arp_context { int net_arp_dev_init(struct device *dev) { - struct net_arp_context *net_arp_context = dev->driver_data; + struct net_arp_context *net_arp_context = dev->data; net_arp_context = net_arp_context; @@ -61,7 +61,7 @@ int net_arp_dev_init(struct device *dev) static uint8_t *net_arp_get_mac(struct device *dev) { - struct net_arp_context *context = dev->driver_data; + struct net_arp_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c index e462b2f8403..5618334433d 100644 --- a/tests/net/checksum_offload/src/main.c +++ b/tests/net/checksum_offload/src/main.c @@ -97,7 +97,7 @@ static struct eth_context eth_context_offloading_enabled; static void eth_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; net_if_set_link_addr(iface, context->mac_addr, sizeof(context->mac_addr), @@ -138,7 +138,7 @@ static uint16_t get_udp_chksum(struct net_pkt *pkt) static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; zassert_equal_ptr(ð_context_offloading_disabled, context, "Context pointers do not match (%p vs %p)", @@ -217,7 +217,7 @@ static int eth_tx_offloading_disabled(struct device *dev, struct net_pkt *pkt) static int eth_tx_offloading_enabled(struct device *dev, struct net_pkt *pkt) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; zassert_equal_ptr(ð_context_offloading_enabled, context, "Context pointers do not match (%p vs %p)", @@ -281,7 +281,7 @@ static void generate_mac(uint8_t *mac_addr) static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); @@ -337,7 +337,7 @@ static void iface_cb(struct net_if *iface, void *user_data) if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) { struct eth_context *eth_ctx = - net_if_get_device(iface)->driver_data; + net_if_get_device(iface)->data; if (eth_ctx == ð_context_offloading_disabled) { DBG("Iface %p without offloading\n", iface); @@ -485,7 +485,7 @@ static void test_tx_chksum_offload_disabled_test_v6(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[0]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_disabled, ctx, "eth context mismatch"); @@ -536,7 +536,7 @@ static void test_tx_chksum_offload_disabled_test_v4(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[0]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_disabled, ctx, "eth context mismatch"); @@ -587,7 +587,7 @@ static void test_tx_chksum_offload_enabled_test_v6(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[1]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_enabled, ctx, "eth context mismatch"); @@ -638,7 +638,7 @@ static void test_tx_chksum_offload_enabled_test_v4(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[1]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_enabled, ctx, "eth context mismatch"); @@ -732,7 +732,7 @@ static void test_rx_chksum_offload_disabled_test_v6(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[0]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_disabled, ctx, "eth context mismatch"); @@ -788,7 +788,7 @@ static void test_rx_chksum_offload_disabled_test_v4(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[0]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_disabled, ctx, "eth context mismatch"); @@ -844,7 +844,7 @@ static void test_rx_chksum_offload_enabled_test_v6(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[1]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_enabled, ctx, "eth context mismatch"); @@ -898,7 +898,7 @@ static void test_rx_chksum_offload_enabled_test_v4(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[1]; - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; zassert_equal_ptr(ð_context_offloading_enabled, ctx, "eth context mismatch"); diff --git a/tests/net/context/src/main.c b/tests/net/context/src/main.c index d6c95e23a9b..659dcde9b76 100644 --- a/tests/net/context/src/main.c +++ b/tests/net/context/src/main.c @@ -864,7 +864,7 @@ int net_context_dev_init(struct device *dev) static uint8_t *net_context_get_mac(struct device *dev) { - struct net_context_test *context = dev->driver_data; + struct net_context_test *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c index 4338f46fae5..c63803f98ce 100644 --- a/tests/net/dhcpv4/src/main.c +++ b/tests/net/dhcpv4/src/main.c @@ -165,7 +165,7 @@ struct net_dhcpv4_context { static int net_dhcpv4_dev_init(struct device *dev) { - struct net_dhcpv4_context *net_dhcpv4_context = dev->driver_data; + struct net_dhcpv4_context *net_dhcpv4_context = dev->data; net_dhcpv4_context = net_dhcpv4_context; @@ -174,7 +174,7 @@ static int net_dhcpv4_dev_init(struct device *dev) static uint8_t *net_dhcpv4_get_mac(struct device *dev) { - struct net_dhcpv4_context *context = dev->driver_data; + struct net_dhcpv4_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c index de09a5897a8..762e2b0b017 100644 --- a/tests/net/ethernet_mgmt/src/main.c +++ b/tests/net/ethernet_mgmt/src/main.c @@ -42,7 +42,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; @@ -119,7 +119,7 @@ static int eth_fake_set_config(struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int priority_queues_num = ARRAY_SIZE(ctx->priority_queues); enum ethernet_qav_param_type qav_param_type; int queue_id; @@ -214,7 +214,7 @@ static int eth_fake_get_config(struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int priority_queues_num = ARRAY_SIZE(ctx->priority_queues); enum ethernet_qav_param_type qav_param_type; int queue_id; @@ -274,7 +274,7 @@ static struct ethernet_api eth_fake_api_funcs = { static int eth_fake_init(struct device *dev) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int i; ctx->auto_negotiation = true; @@ -446,7 +446,7 @@ static void test_change_qav_params(void) { struct net_if *iface = net_if_get_default(); struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; struct ethernet_req_params params; int available_priority_queues; int i; diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c index 19129868d81..b096749129d 100644 --- a/tests/net/hostname/src/main.c +++ b/tests/net/hostname/src/main.c @@ -69,7 +69,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -141,7 +141,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; @@ -176,7 +176,7 @@ static struct ethernet_api eth_fake_api_funcs = { static int eth_fake_init(struct device *dev) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->promisc_mode = false; @@ -229,7 +229,7 @@ static void test_iface_setup(void) idx = net_if_get_by_iface(iface1); ((struct net_if_test *) - net_if_get_device(iface1)->driver_data)->idx = idx; + net_if_get_device(iface1)->data)->idx = idx; DBG("Interfaces: [%d] iface1 %p\n", net_if_get_by_iface(iface1), iface1); diff --git a/tests/net/icmpv4/src/main.c b/tests/net/icmpv4/src/main.c index cf21e7b6947..40e65d5616a 100644 --- a/tests/net/icmpv4/src/main.c +++ b/tests/net/icmpv4/src/main.c @@ -139,7 +139,7 @@ struct net_icmpv4_context { static int net_icmpv4_dev_init(struct device *dev) { - struct net_icmpv4_context *net_icmpv4_context = dev->driver_data; + struct net_icmpv4_context *net_icmpv4_context = dev->data; net_icmpv4_context = net_icmpv4_context; @@ -148,7 +148,7 @@ static int net_icmpv4_dev_init(struct device *dev) static uint8_t *net_icmpv4_get_mac(struct device *dev) { - struct net_icmpv4_context *context = dev->driver_data; + struct net_icmpv4_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c index a7f5044467b..d8603a8237d 100644 --- a/tests/net/iface/src/main.c +++ b/tests/net/iface/src/main.c @@ -82,7 +82,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -116,7 +116,7 @@ static int sender_iface(struct device *dev, struct net_pkt *pkt) } if (test_started) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; DBG("Sending at iface %d %p\n", net_if_get_by_iface(net_pkt_iface(pkt)), @@ -196,7 +196,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; @@ -225,7 +225,7 @@ static int eth_fake_set_config(struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; switch (type) { case ETHERNET_CONFIG_TYPE_PROMISC_MODE: @@ -254,7 +254,7 @@ static struct ethernet_api eth_fake_api_funcs = { static int eth_fake_init(struct device *dev) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->promisc_mode = false; @@ -289,7 +289,7 @@ static void iface_cb(struct net_if *iface, void *user_data) if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) { const struct ethernet_api *api = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; /* As native_posix board will introduce another ethernet * interface, make sure that we only use our own in this test. @@ -328,15 +328,15 @@ static void test_iface_setup(void) idx = net_if_get_by_iface(iface1); ((struct net_if_test *) - net_if_get_device(iface1)->driver_data)->idx = idx; + net_if_get_device(iface1)->data)->idx = idx; idx = net_if_get_by_iface(iface2); ((struct net_if_test *) - net_if_get_device(iface2)->driver_data)->idx = idx; + net_if_get_device(iface2)->data)->idx = idx; idx = net_if_get_by_iface(iface3); ((struct net_if_test *) - net_if_get_device(iface3)->driver_data)->idx = idx; + net_if_get_device(iface3)->data)->idx = idx; DBG("Interfaces: [%d] iface1 %p, [%d] iface2 %p, [%d] iface3 %p\n", net_if_get_by_iface(iface1), iface1, diff --git a/tests/net/ip-addr/src/main.c b/tests/net/ip-addr/src/main.c index 09a32f9d219..5341db63ea9 100644 --- a/tests/net/ip-addr/src/main.c +++ b/tests/net/ip-addr/src/main.c @@ -107,7 +107,7 @@ struct net_test_context { int net_test_init(struct device *dev) { - struct net_test_context *net_test_context = dev->driver_data; + struct net_test_context *net_test_context = dev->data; net_test_context = net_test_context; @@ -116,7 +116,7 @@ int net_test_init(struct device *dev) static uint8_t *net_test_get_mac(struct device *dev) { - struct net_test_context *context = dev->driver_data; + struct net_test_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/ipv6/src/main.c b/tests/net/ipv6/src/main.c index f2d63da9045..32dcdaf7cbb 100644 --- a/tests/net/ipv6/src/main.c +++ b/tests/net/ipv6/src/main.c @@ -146,7 +146,7 @@ int net_test_dev_init(struct device *dev) static uint8_t *net_test_get_mac(struct device *dev) { - struct net_test_ipv6 *context = dev->driver_data; + struct net_test_ipv6 *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/ipv6_fragment/src/main.c b/tests/net/ipv6_fragment/src/main.c index f3d41e2f3b5..2b5b39d11e3 100644 --- a/tests/net/ipv6_fragment/src/main.c +++ b/tests/net/ipv6_fragment/src/main.c @@ -933,7 +933,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -1445,9 +1445,9 @@ static void test_setup(void) iface1 = net_if_get_by_index(1); iface2 = net_if_get_by_index(2); - ((struct net_if_test *)net_if_get_device(iface1)->driver_data)->idx = + ((struct net_if_test *) net_if_get_device(iface1)->data)->idx = net_if_get_by_iface(iface1); - ((struct net_if_test *)net_if_get_device(iface2)->driver_data)->idx = + ((struct net_if_test *) net_if_get_device(iface2)->data)->idx = net_if_get_by_iface(iface2); idx = net_if_get_by_iface(iface1); diff --git a/tests/net/lib/dns_addremove/src/main.c b/tests/net/lib/dns_addremove/src/main.c index 74e37ecbb4f..24dd9499897 100644 --- a/tests/net/lib/dns_addremove/src/main.c +++ b/tests/net/lib/dns_addremove/src/main.c @@ -86,7 +86,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -161,7 +161,7 @@ static void test_init(void) iface1 = net_if_get_by_index(1); - ((struct net_if_test *)net_if_get_device(iface1)->driver_data)->idx = + ((struct net_if_test *) net_if_get_device(iface1)->data)->idx = net_if_get_by_iface(iface1); #if defined(CONFIG_NET_IPV6) diff --git a/tests/net/lib/dns_resolve/src/main.c b/tests/net/lib/dns_resolve/src/main.c index d0de0976e02..9fa2ec1f306 100644 --- a/tests/net/lib/dns_resolve/src/main.c +++ b/tests/net/lib/dns_resolve/src/main.c @@ -84,7 +84,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -132,7 +132,7 @@ static int sender_iface(struct device *dev, struct net_pkt *pkt) } if (!timeout_query) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; struct dns_resolve_context *ctx; int slot; @@ -209,7 +209,7 @@ static void test_init(void) iface1 = net_if_get_by_index(1); - ((struct net_if_test *)net_if_get_device(iface1)->driver_data)->idx = + ((struct net_if_test *) net_if_get_device(iface1)->data)->idx = net_if_get_by_iface(iface1); #if defined(CONFIG_NET_IPV6) diff --git a/tests/net/mld/src/main.c b/tests/net/mld/src/main.c index df7aecd98ae..1815b1c7671 100644 --- a/tests/net/mld/src/main.c +++ b/tests/net/mld/src/main.c @@ -75,7 +75,7 @@ int net_test_dev_init(struct device *dev) static uint8_t *net_test_get_mac(struct device *dev) { - struct net_test_mld *context = dev->driver_data; + struct net_test_mld *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c index 2708a177de9..d2f79a4b1d5 100644 --- a/tests/net/pm/src/main.c +++ b/tests/net/pm/src/main.c @@ -24,7 +24,7 @@ struct fake_dev_context { static int fake_dev_pm_control(struct device *dev, uint32_t command, void *context, device_pm_cb cb, void *arg) { - struct fake_dev_context *ctx = dev->driver_data; + struct fake_dev_context *ctx = dev->data; int ret = 0; if (command == DEVICE_PM_SET_POWER_STATE) { @@ -75,7 +75,7 @@ static uint8_t *fake_dev_get_mac(struct fake_dev_context *ctx) static void fake_dev_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct fake_dev_context *ctx = dev->driver_data; + struct fake_dev_context *ctx = dev->data; uint8_t *mac = fake_dev_get_mac(ctx); net_if_set_link_addr(iface, mac, 6, NET_LINK_ETHERNET); diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c index 748a3a2750c..6c681bed1b4 100644 --- a/tests/net/promiscuous/src/main.c +++ b/tests/net/promiscuous/src/main.c @@ -77,7 +77,7 @@ static struct eth_fake_context eth_fake_data2; static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; @@ -106,7 +106,7 @@ static int eth_fake_set_config(struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; switch (type) { case ETHERNET_CONFIG_TYPE_PROMISC_MODE: @@ -135,7 +135,7 @@ static struct ethernet_api eth_fake_api_funcs = { static int eth_fake_init(struct device *dev) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->promisc_mode = false; @@ -176,7 +176,7 @@ static void iface_cb(struct net_if *iface, void *user_data) if (net_if_l2(iface) == &NET_L2_GET_NAME(ETHERNET)) { const struct ethernet_api *api = - net_if_get_device(iface)->driver_api; + net_if_get_device(iface)->api; /* As native_posix board will introduce another ethernet * interface, make sure that we only use our own in this test. @@ -207,11 +207,11 @@ static void test_iface_setup(void) idx = net_if_get_by_iface(iface1); ((struct net_if_test *) - net_if_get_device(iface1)->driver_data)->idx = idx; + net_if_get_device(iface1)->data)->idx = idx; idx = net_if_get_by_iface(iface2); ((struct net_if_test *) - net_if_get_device(iface2)->driver_data)->idx = idx; + net_if_get_device(iface2)->data)->idx = idx; zassert_not_null(iface1, "Interface 1"); zassert_not_null(iface2, "Interface 2"); diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c index 573ec21f39d..7607196b01d 100644 --- a/tests/net/ptp/clock/src/main.c +++ b/tests/net/ptp/clock/src/main.c @@ -87,7 +87,7 @@ static struct eth_context eth_context_3; static void eth_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; net_if_set_link_addr(iface, context->mac_addr, sizeof(context->mac_addr), @@ -98,7 +98,7 @@ static void eth_iface_init(struct net_if *iface) static int eth_tx(struct device *dev, struct net_pkt *pkt) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; if (ð_context_1 != context && ð_context_2 != context) { zassert_true(false, "Context pointers do not match\n"); @@ -124,7 +124,7 @@ static enum ethernet_hw_caps eth_capabilities(struct device *dev) static struct device *eth_get_ptp_clock(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; return context->ptp_clock; } @@ -150,7 +150,7 @@ static void generate_mac(uint8_t *mac_addr) static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); @@ -184,7 +184,7 @@ struct ptp_context { static int my_ptp_clock_set(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_ctx = dev->driver_data; + struct ptp_context *ptp_ctx = dev->data; struct eth_context *eth_ctx = ptp_ctx->eth_context; if (ð_context_1 != eth_ctx && ð_context_2 != eth_ctx) { @@ -198,7 +198,7 @@ static int my_ptp_clock_set(struct device *dev, struct net_ptp_time *tm) static int my_ptp_clock_get(struct device *dev, struct net_ptp_time *tm) { - struct ptp_context *ptp_ctx = dev->driver_data; + struct ptp_context *ptp_ctx = dev->data; struct eth_context *eth_ctx = ptp_ctx->eth_context; memcpy(tm, ð_ctx->time, sizeof(struct net_ptp_time)); @@ -208,7 +208,7 @@ static int my_ptp_clock_get(struct device *dev, struct net_ptp_time *tm) static int my_ptp_clock_adjust(struct device *dev, int increment) { - struct ptp_context *ptp_ctx = dev->driver_data; + struct ptp_context *ptp_ctx = dev->data; struct eth_context *eth_ctx = ptp_ctx->eth_context; eth_ctx->time.nanosecond += increment; @@ -234,8 +234,8 @@ static const struct ptp_clock_driver_api api = { static int ptp_test_1_init(struct device *port) { struct device *eth_dev = DEVICE_GET(eth_test_1); - struct eth_context *context = eth_dev->driver_data; - struct ptp_context *ptp_context = port->driver_data; + struct eth_context *context = eth_dev->data; + struct ptp_context *ptp_context = port->data; context->ptp_clock = port; ptp_context->eth_context = context; @@ -250,8 +250,8 @@ DEVICE_AND_API_INIT(ptp_clock_1, PTP_CLOCK_NAME, ptp_test_1_init, static int ptp_test_2_init(struct device *port) { struct device *eth_dev = DEVICE_GET(eth_test_2); - struct eth_context *context = eth_dev->driver_data; - struct ptp_context *ptp_context = port->driver_data; + struct eth_context *context = eth_dev->data; + struct ptp_context *ptp_context = port->data; context->ptp_clock = port; ptp_context->eth_context = context; diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c index db064c2f6fd..6d965e79ad1 100644 --- a/tests/net/route/src/main.c +++ b/tests/net/route/src/main.c @@ -100,7 +100,7 @@ int net_route_dev_init(struct device *dev) static uint8_t *net_route_get_mac(struct device *dev) { - struct net_route_test *route = dev->driver_data; + struct net_route_test *route = dev->data; if (route->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/shell/src/main.c b/tests/net/shell/src/main.c index 38765a01b64..0c94edcb0d3 100644 --- a/tests/net/shell/src/main.c +++ b/tests/net/shell/src/main.c @@ -60,7 +60,7 @@ struct net_udp_context { int net_udp_dev_init(struct device *dev) { - struct net_udp_context *net_udp_context = dev->driver_data; + struct net_udp_context *net_udp_context = dev->data; net_udp_context = net_udp_context; @@ -69,7 +69,7 @@ int net_udp_dev_init(struct device *dev) static uint8_t *net_udp_get_mac(struct device *dev) { - struct net_udp_context *context = dev->driver_data; + struct net_udp_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c index 1d92f74c244..48288409cdb 100644 --- a/tests/net/socket/af_packet/src/main.c +++ b/tests/net/socket/af_packet/src/main.c @@ -58,7 +58,7 @@ static int eth_fake_send(struct device *dev, struct net_pkt *pkt) static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c index a86a3eae3c4..7ac59a4ef40 100644 --- a/tests/net/socket/net_mgmt/src/main.c +++ b/tests/net/socket/net_mgmt/src/main.c @@ -54,7 +54,7 @@ static struct eth_fake_context eth_fake_data; static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; @@ -124,7 +124,7 @@ static int eth_fake_set_config(struct device *dev, enum ethernet_config_type type, const struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int priority_queues_num = ARRAY_SIZE(ctx->priority_queues); enum ethernet_qav_param_type qav_param_type; int queue_id; @@ -171,7 +171,7 @@ static int eth_fake_get_config(struct device *dev, enum ethernet_config_type type, struct ethernet_config *config) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int priority_queues_num = ARRAY_SIZE(ctx->priority_queues); enum ethernet_qav_param_type qav_param_type; int queue_id; @@ -235,7 +235,7 @@ static struct ethernet_api eth_fake_api_funcs = { static int eth_fake_init(struct device *dev) { - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; int i; ctx->auto_negotiation = true; diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c index 5f36ba5cfe0..11c058e2daa 100644 --- a/tests/net/socket/udp/src/main.c +++ b/tests/net/socket/udp/src/main.c @@ -810,7 +810,7 @@ static struct net_linkaddr server_link_addr = { static void eth_fake_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_fake_context *ctx = dev->driver_data; + struct eth_fake_context *ctx = dev->data; ctx->iface = iface; diff --git a/tests/net/tcp/src/main.c b/tests/net/tcp/src/main.c index 06f6a029bda..94e22b80b83 100644 --- a/tests/net/tcp/src/main.c +++ b/tests/net/tcp/src/main.c @@ -1748,7 +1748,7 @@ static bool test_init(void) * used target board and linker. We cannot guarantee that network * interfaces are always set the same way in the linker section. */ - api = net_if_get_device(iface)->driver_api; + api = net_if_get_device(iface)->api; if (api->send != tester_send) { my_iface = iface + 1; peer_iface = iface; diff --git a/tests/net/tcp2/src/main.c b/tests/net/tcp2/src/main.c index dc639c4a22d..70e27b54997 100644 --- a/tests/net/tcp2/src/main.c +++ b/tests/net/tcp2/src/main.c @@ -113,7 +113,7 @@ struct net_tcp_context { static int net_tcp_dev_init(struct device *dev) { - struct net_tcp_context *net_tcp_context = dev->driver_data; + struct net_tcp_context *net_tcp_context = dev->data; net_tcp_context = net_tcp_context; @@ -122,7 +122,7 @@ static int net_tcp_dev_init(struct device *dev) static uint8_t *net_tcp_get_mac(struct device *dev) { - struct net_tcp_context *context = dev->driver_data; + struct net_tcp_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/traffic_class/src/main.c b/tests/net/traffic_class/src/main.c index 9cfda63949b..43474476620 100644 --- a/tests/net/traffic_class/src/main.c +++ b/tests/net/traffic_class/src/main.c @@ -107,7 +107,7 @@ static struct eth_context eth_context; static void eth_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; net_if_set_link_addr(iface, context->mac_addr, sizeof(context->mac_addr), @@ -255,7 +255,7 @@ static void generate_mac(uint8_t *mac_addr) static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c index 599c760721b..ce6f2364f73 100644 --- a/tests/net/tx_timestamp/src/main.c +++ b/tests/net/tx_timestamp/src/main.c @@ -89,7 +89,7 @@ static struct eth_context eth_context2; static void eth_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; net_if_set_link_addr(iface, context->mac_addr, sizeof(context->mac_addr), @@ -146,7 +146,7 @@ static void generate_mac(uint8_t *mac_addr) static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); diff --git a/tests/net/udp/src/main.c b/tests/net/udp/src/main.c index 79521837fb2..b9d863b847b 100644 --- a/tests/net/udp/src/main.c +++ b/tests/net/udp/src/main.c @@ -62,7 +62,7 @@ struct net_udp_context { int net_udp_dev_init(struct device *dev) { - struct net_udp_context *net_udp_context = dev->driver_data; + struct net_udp_context *net_udp_context = dev->data; net_udp_context = net_udp_context; @@ -71,7 +71,7 @@ int net_udp_dev_init(struct device *dev) static uint8_t *net_udp_get_mac(struct device *dev) { - struct net_udp_context *context = dev->driver_data; + struct net_udp_context *context = dev->data; if (context->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c index b7721b2ff23..80c987ca50a 100644 --- a/tests/net/vlan/src/main.c +++ b/tests/net/vlan/src/main.c @@ -97,7 +97,7 @@ static struct eth_context eth_vlan_context; static void eth_vlan_iface_init(struct net_if *iface) { struct device *dev = net_if_get_device(iface); - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; net_if_set_link_addr(iface, context->mac_addr, sizeof(context->mac_addr), @@ -108,7 +108,7 @@ static void eth_vlan_iface_init(struct net_if *iface) static int eth_tx(struct device *dev, struct net_pkt *pkt) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; zassert_equal_ptr(ð_vlan_context, context, "Context pointers do not match (%p vs %p)", @@ -164,7 +164,7 @@ static void generate_mac(uint8_t *mac_addr) static int eth_vlan_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); @@ -178,7 +178,7 @@ ETH_NET_DEVICE_INIT(eth_vlan_test, "eth_vlan_test", static int eth_init(struct device *dev) { - struct eth_context *context = dev->driver_data; + struct eth_context *context = dev->data; generate_mac(context->mac_addr); @@ -207,7 +207,7 @@ static int net_iface_dev_init(struct device *dev) static uint8_t *net_iface_get_mac(struct device *dev) { - struct net_if_test *data = dev->driver_data; + struct net_if_test *data = dev->data; if (data->mac_addr[2] == 0x00) { /* 00-00-5E-00-53-xx Documentation RFC 7042 */ @@ -742,7 +742,7 @@ static void test_vlan_send_data(void) zassert_equal(ret, 0, "Context bind failure test failed"); iface = eth_interfaces[1]; /* This is the VLAN interface */ - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; eth_ctx = net_if_l2_data(iface); ret = net_eth_is_vlan_enabled(eth_ctx, iface); zassert_equal(ret, true, "VLAN disabled for interface 1"); @@ -750,7 +750,7 @@ static void test_vlan_send_data(void) ctx->expecting_tag = VLAN_TAG_1; iface = eth_interfaces[3]; /* This is also VLAN interface */ - ctx = net_if_get_device(iface)->driver_data; + ctx = net_if_get_device(iface)->data; eth_ctx = net_if_l2_data(iface); ret = net_eth_is_vlan_enabled(eth_ctx, iface); zassert_equal(ret, true, "VLAN disabled for interface 1"); diff --git a/tests/subsys/openthread/radio_test.c b/tests/subsys/openthread/radio_test.c index 9bbec8a7920..e4283b78fa0 100644 --- a/tests/subsys/openthread/radio_test.c +++ b/tests/subsys/openthread/radio_test.c @@ -73,7 +73,7 @@ static struct ieee802154_radio_api rapi = { .ed_scan = scan_mock }; -static struct device radio = { .driver_api = &rapi }; +static struct device radio = { .api = &rapi }; static int scan_mock(struct device *dev, uint16_t duration, energy_scan_done_cb_t done_cb) diff --git a/tests/subsys/storage/stream/stream_flash/src/main.c b/tests/subsys/storage/stream/stream_flash/src/main.c index 043affef1ee..05f5b063211 100644 --- a/tests/subsys/storage/stream/stream_flash/src/main.c +++ b/tests/subsys/storage/stream/stream_flash/src/main.c @@ -378,7 +378,7 @@ static void test_stream_flash_buffered_write_whole_page(void) void test_main(void) { fdev = device_get_binding(FLASH_NAME); - api = fdev->driver_api; + api = fdev->api; api->page_layout(fdev, &layout, &layout_size); page_size = layout->pages_size;