michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: i2c: Fix device instance const qualifier loss

Browse source 
In all of these drivers, passing the device's data was sufficient as
only the data is being used by the HAL callback function then.

Fixes #27399

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-07-08 10:09:52 +02:00 • committed by Carles Cufí
commit 206f4d61fc
6 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/i2c/i2c_mcux.c
View file

@ -75,10 +75,10 @@ static int i2c_mcux_configure(const struct device *dev,
}
static void i2c_mcux_master_transfer_callback(I2C_Type *base,
i2c_master_handle_t *handle, status_t status, void *userData)
i2c_master_handle_t *handle,
status_t status, void *userData)
{
const struct device *dev = userData;
struct i2c_mcux_data *data = DEV_DATA(dev);
struct i2c_mcux_data *data = userData;
ARG_UNUSED(handle);
ARG_UNUSED(base);
@ -187,7 +187,7 @@ static int i2c_mcux_init(const struct device *dev)
I2C_MasterGetDefaultConfig(&master_config);
I2C_MasterInit(base, &master_config, clock_freq);
I2C_MasterTransferCreateHandle(base, &data->handle,
i2c_mcux_master_transfer_callback, dev);
i2c_mcux_master_transfer_callback, data);
bitrate_cfg = i2c_map_dt_bitrate(config->bitrate);

10
drivers/i2c/i2c_mcux_flexcomm.c
View file

@ -67,10 +67,11 @@ static int mcux_flexcomm_configure(const struct device *dev,
}
static void mcux_flexcomm_master_transfer_callback(I2C_Type *base,
i2c_master_handle_t *handle, status_t status, void *userData)
i2c_master_handle_t *handle,
status_t status,
void *userData)
{
const struct device *dev = userData;
struct mcux_flexcomm_data *data = dev->data;
struct mcux_flexcomm_data *data = userData;
ARG_UNUSED(handle);
ARG_UNUSED(base);
@ -184,7 +185,8 @@ static int mcux_flexcomm_init(const struct device *dev)
I2C_MasterGetDefaultConfig(&master_config);
I2C_MasterInit(base, &master_config, clock_freq);
I2C_MasterTransferCreateHandle(base, &data->handle,
mcux_flexcomm_master_transfer_callback, dev);
mcux_flexcomm_master_transfer_callback,
data);
bitrate_cfg = i2c_map_dt_bitrate(config->bitrate);

9
drivers/i2c/i2c_mcux_lpi2c.c
View file

@ -79,10 +79,10 @@ static int mcux_lpi2c_configure(const struct device *dev,
}
static void mcux_lpi2c_master_transfer_callback(LPI2C_Type *base,
lpi2c_master_handle_t *handle, status_t status, void *userData)
lpi2c_master_handle_t *handle,
status_t status, void *userData)
{
const struct device *dev = userData;
struct mcux_lpi2c_data *data = dev->data;
struct mcux_lpi2c_data *data = userData;
ARG_UNUSED(handle);
ARG_UNUSED(base);
@ -205,7 +205,8 @@ static int mcux_lpi2c_init(const struct device *dev)
master_config.busIdleTimeout_ns = config->bus_idle_timeout_ns;
LPI2C_MasterInit(base, &master_config, clock_freq);
LPI2C_MasterTransferCreateHandle(base, &data->handle,
mcux_lpi2c_master_transfer_callback, dev);
mcux_lpi2c_master_transfer_callback,
data);
bitrate_cfg = i2c_map_dt_bitrate(config->bitrate);

6
drivers/i2c/i2c_nrfx_twi.c
View file

@ -144,8 +144,7 @@ static int i2c_nrfx_twi_transfer(const struct device *dev,
static void event_handler(nrfx_twi_evt_t const *p_event, void *p_context)
{
const struct device *dev = p_context;
struct i2c_nrfx_twi_data *dev_data = get_dev_data(dev);
struct i2c_nrfx_twi_data *dev_data = p_context;
switch (p_event->type) {
case NRFX_TWI_EVT_DONE:
@ -197,9 +196,10 @@ static const struct i2c_driver_api i2c_nrfx_twi_driver_api = {
static int init_twi(const struct device *dev)
{
struct i2c_nrfx_twi_data *dev_data = get_dev_data(dev);
nrfx_err_t result = nrfx_twi_init(&get_dev_config(dev)->twi,
&get_dev_config(dev)->config,
event_handler, dev);
event_handler, dev_data);
if (result != NRFX_SUCCESS) {
LOG_ERR("Failed to initialize device: %s",
dev->name);

6
drivers/i2c/i2c_nrfx_twim.c
View file

@ -181,8 +181,7 @@ static int i2c_nrfx_twim_transfer(const struct device *dev,
static void event_handler(nrfx_twim_evt_t const *p_event, void *p_context)
{
const struct device *dev = p_context;
struct i2c_nrfx_twim_data *dev_data = get_dev_data(dev);
struct i2c_nrfx_twim_data *dev_data = p_context;
switch (p_event->type) {
case NRFX_TWIM_EVT_DONE:
@ -234,10 +233,11 @@ static const struct i2c_driver_api i2c_nrfx_twim_driver_api = {
static int init_twim(const struct device *dev)
{
struct i2c_nrfx_twim_data *dev_data = get_dev_data(dev);
nrfx_err_t result = nrfx_twim_init(&get_dev_config(dev)->twim,
&get_dev_config(dev)->config,
event_handler,
dev);
dev_data);
if (result != NRFX_SUCCESS) {
LOG_ERR("Failed to initialize device: %s",
dev->name);

5
drivers/i2c/i2c_rv32m1_lpi2c.c
View file

@ -102,8 +102,7 @@ static void rv32m1_lpi2c_master_transfer_callback(LPI2C_Type *base,
status_t completionStatus,
void *userData)
{
const struct device *dev = userData;
struct rv32m1_lpi2c_data *data = dev->data;
struct rv32m1_lpi2c_data *data = userData;
ARG_UNUSED(base);
ARG_UNUSED(handle);
@ -244,7 +243,7 @@ static int rv32m1_lpi2c_init(const struct device *dev)
LPI2C_MasterInit(config->base, &master_config, clk_freq);
LPI2C_MasterTransferCreateHandle(config->base, &data->handle,
rv32m1_lpi2c_master_transfer_callback,
dev);
data);
dev_cfg = i2c_map_dt_bitrate(config->bitrate);
err = rv32m1_lpi2c_configure(dev, dev_cfg | I2C_MODE_MASTER);