From bbcd112335d3ac02fdf4cd320a98e5cebfe59407 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Tue, 18 Jan 2022 17:04:23 +0100 Subject: [PATCH] tests: drivers: i2c: drop DEV_DATA/DEV_CFG usage Stop using redundant DEV_DATA/DEV_CFG macros and use dev->data and dev->config instead. Signed-off-by: Gerard Marull-Paretas --- tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 2bdabeff609..20970fe85a7 100644 --- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c +++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c @@ -15,8 +15,6 @@ #include LOG_MODULE_DECLARE(main); -#define DEV_DATA(dev) ((struct i2c_virtual_data * const)(dev)->data) - struct i2c_virtual_data { sys_slist_t slaves; }; @@ -50,7 +48,7 @@ static struct i2c_slave_config *find_address(struct i2c_virtual_data *data, int i2c_virtual_slave_register(const struct device *dev, struct i2c_slave_config *config) { - struct i2c_virtual_data *data = DEV_DATA(dev); + struct i2c_virtual_data *data = dev->data; if (!config) { return -EINVAL; @@ -71,7 +69,7 @@ int i2c_virtual_slave_register(const struct device *dev, int i2c_virtual_slave_unregister(const struct device *dev, struct i2c_slave_config *config) { - struct i2c_virtual_data *data = DEV_DATA(dev); + struct i2c_virtual_data *data = dev->data; if (!config) { return -EINVAL; @@ -151,7 +149,7 @@ static int i2c_virtual_msg_read(const struct device *dev, struct i2c_msg *msg, static int i2c_virtual_transfer(const struct device *dev, struct i2c_msg *msg, uint8_t num_msgs, uint16_t slave) { - struct i2c_virtual_data *data = DEV_DATA(dev); + struct i2c_virtual_data *data = dev->data; struct i2c_msg *current, *next; struct i2c_slave_config *cfg; bool is_write = false; @@ -215,7 +213,7 @@ static const struct i2c_driver_api api_funcs = { static int i2c_virtual_init(const struct device *dev) { - struct i2c_virtual_data *data = DEV_DATA(dev); + struct i2c_virtual_data *data = dev->data; sys_slist_init(&data->slaves);