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/ccs811/ccs811_trigger.c
View file

@ -20,7 +20,7 @@ int ccs811_attr_set(struct device *dev,
enum sensor_attribute attr,
const struct sensor_value *thr)
{
struct ccs811_data *drv_data = dev->driver_data;
struct ccs811_data *drv_data = dev->data;
int rc;
if (chan != SENSOR_CHAN_CO2) {
@ -48,7 +48,7 @@ int ccs811_attr_set(struct device *dev,
static inline void setup_irq(struct device *dev,
bool enable)
{
struct ccs811_data *data = dev->driver_data;
struct ccs811_data *data = dev->data;
unsigned int flags = enable
? GPIO_INT_LEVEL_ACTIVE
: GPIO_INT_DISABLE;
@ -58,7 +58,7 @@ static inline void setup_irq(struct device *dev,
static inline void handle_irq(struct device *dev)
{
struct ccs811_data *data = dev->driver_data;
struct ccs811_data *data = dev->data;
setup_irq(dev, false);
@ -71,7 +71,7 @@ static inline void handle_irq(struct device *dev)
static void process_irq(struct device *dev)
{
struct ccs811_data *data = dev->driver_data;
struct ccs811_data *data = dev->data;
if (data->handler != NULL) {
data->handler(dev, &data->trigger);
@ -98,7 +98,7 @@ static void gpio_callback(struct device *dev,
static void irq_thread(int dev_ptr, int unused)
{
struct device *dev = INT_TO_POINTER(dev_ptr);
struct ccs811_data *drv_data = dev->driver_data;
struct ccs811_data *drv_data = dev->data;
ARG_UNUSED(unused);
@ -122,7 +122,7 @@ int ccs811_trigger_set(struct device *dev,
const struct sensor_trigger *trig,
sensor_trigger_handler_t handler)
{
struct ccs811_data *drv_data = dev->driver_data;
struct ccs811_data *drv_data = dev->data;
uint8_t drdy_thresh = CCS811_MODE_THRESH | CCS811_MODE_DATARDY;
int rc;
@ -170,7 +170,7 @@ int ccs811_trigger_set(struct device *dev,
int ccs811_init_interrupt(struct device *dev)
{
struct ccs811_data *drv_data = dev->driver_data;
struct ccs811_data *drv_data = dev->data;
drv_data->dev = dev;