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

14
drivers/sensor/adt7420/adt7420.c
View file

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

12
drivers/sensor/adt7420/adt7420_trigger.c
View file

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