michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: Apply driver_api/data attributes rename everywhere

Browse source 
Via coccinelle:

@r_device_driver_api_and_data_1@
struct device *D;
@@
(
D->
-	driver_api
+	api
|
D->
-	driver_data
+	data
)

@r_device_driver_api_and_data_2@
expression E;
@@
(
net_if_get_device(E)->
-	driver_api
+	api
|
net_if_get_device(E)->
-	driver_data
+	data
)

And grep/sed rules for macros:

git grep -rlz 'dev)->driver_data' |
	xargs -0 sed -i 's/dev)->driver_data/dev)->data/g'

git grep -rlz 'dev->driver_data' |
	xargs -0 sed -i 's/dev->driver_data/dev->data/g'

git grep -rlz 'device->driver_data' |
	xargs -0 sed -i 's/device->driver_data/device->data/g'

Fixes #27397

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-05-28 21:23:02 +02:00 • committed by Carles Cufí
commit 98d9b01322
498 changed files with 2085 additions and 2087 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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) {

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

@ -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,

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

@ -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;

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

@ -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,

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

@ -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;