michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: Fix structure attributes access

Browse source 
Since struct devconfig was merged earlier into struct device, let's fix
accessing config_info, name, ... attributes everywhere via:

grep -rlZ 'dev->config->' | xargs -0 sed -i 's/dev->config->/dev->/g'

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-03-09 12:49:07 +01:00 • committed by Carles Cufí
commit 97326c0445
348 changed files with 1155 additions and 1174 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/sensor/lsm6dso/lsm6dso.c
View file

@ -788,7 +788,7 @@ static const struct lsm6dso_config lsm6dso_config = {
static int lsm6dso_init(struct device *dev)
{
const struct lsm6dso_config * const config = dev->config->config_info;
const struct lsm6dso_config * const config = dev->config_info;
struct lsm6dso_data *data = dev->driver_data;
data->bus = device_get_binding(config->bus_name);

4
drivers/sensor/lsm6dso/lsm6dso_i2c.c
View file

@ -24,7 +24,7 @@ static int lsm6dso_i2c_read(struct device *dev, u8_t reg_addr,
u8_t *value, u8_t len)
{
struct lsm6dso_data *data = dev->driver_data;
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
return i2c_burst_read(data->bus, cfg->i2c_slv_addr,
reg_addr, value, len);
@ -34,7 +34,7 @@ static int lsm6dso_i2c_write(struct device *dev, u8_t reg_addr,
u8_t *value, u8_t len)
{
struct lsm6dso_data *data = dev->driver_data;
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
return i2c_burst_write(data->bus, cfg->i2c_slv_addr,
reg_addr, value, len);

6
drivers/sensor/lsm6dso/lsm6dso_spi.c
View file

@ -24,7 +24,7 @@ static int lsm6dso_spi_read(struct device *dev, u8_t reg_addr,
u8_t *value, u8_t len)
{
struct lsm6dso_data *data = dev->driver_data;
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
const struct spi_config *spi_cfg = &cfg->spi_conf;
u8_t buffer_tx[2] = { reg_addr | LSM6DSO_SPI_READ, 0 };
const struct spi_buf tx_buf = {
@ -66,7 +66,7 @@ static int lsm6dso_spi_write(struct device *dev, u8_t reg_addr,
u8_t *value, u8_t len)
{
struct lsm6dso_data *data = dev->driver_data;
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
const struct spi_config *spi_cfg = &cfg->spi_conf;
u8_t buffer_tx[1] = { reg_addr & ~LSM6DSO_SPI_READ };
const struct spi_buf tx_buf[2] = {
@ -107,7 +107,7 @@ int lsm6dso_spi_init(struct device *dev)
data->ctx->handle = dev;
#if DT_INST_SPI_DEV_HAS_CS_GPIOS(0)
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
/* handle SPI CS thru GPIO if it is the case */
data->cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port);

12
drivers/sensor/lsm6dso/lsm6dso_trigger.c
View file

@ -25,7 +25,7 @@ LOG_MODULE_DECLARE(LSM6DSO, CONFIG_SENSOR_LOG_LEVEL);
*/
static int lsm6dso_enable_t_int(struct device *dev, int enable)
{
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
struct lsm6dso_data *lsm6dso = dev->driver_data;
lsm6dso_pin_int2_route_t int2_route;
@ -53,7 +53,7 @@ static int lsm6dso_enable_t_int(struct device *dev, int enable)
*/
static int lsm6dso_enable_xl_int(struct device *dev, int enable)
{
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
struct lsm6dso_data *lsm6dso = dev->driver_data;
if (enable) {
@ -89,7 +89,7 @@ static int lsm6dso_enable_xl_int(struct device *dev, int enable)
*/
static int lsm6dso_enable_g_int(struct device *dev, int enable)
{
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
struct lsm6dso_data *lsm6dso = dev->driver_data;
if (enable) {
@ -168,7 +168,7 @@ static void lsm6dso_handle_interrupt(void *arg)
struct sensor_trigger drdy_trigger = {
.type = SENSOR_TRIG_DATA_READY,
};
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
lsm6dso_status_reg_t status;
while (1) {
@ -209,7 +209,7 @@ static void lsm6dso_gpio_callback(struct device *dev,
{
struct lsm6dso_data *lsm6dso =
CONTAINER_OF(cb, struct lsm6dso_data, gpio_cb);
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
ARG_UNUSED(pins);
@ -251,7 +251,7 @@ static void lsm6dso_work_cb(struct k_work *work)
int lsm6dso_init_interrupt(struct device *dev)
{
struct lsm6dso_data *lsm6dso = dev->driver_data;
const struct lsm6dso_config *cfg = dev->config->config_info;
const struct lsm6dso_config *cfg = dev->config_info;
int ret;
/* setup data ready gpio interrupt (INT1 or INT2) */