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

6
drivers/display/display_dummy.c
View file

@ -17,7 +17,7 @@ static struct dummy_display_data dummy_display_data;
static int dummy_display_init(struct device *dev)
{
struct dummy_display_data *disp_data =
(struct dummy_display_data *)dev->driver_data;
(struct dummy_display_data *)dev->data;
disp_data->current_pixel_format = PIXEL_FORMAT_ARGB_8888;
@ -87,7 +87,7 @@ static void dummy_display_get_capabilities(const struct device *dev,
struct display_capabilities *capabilities)
{
struct dummy_display_data *disp_data =
(struct dummy_display_data *)dev->driver_data;
(struct dummy_display_data *)dev->data;
memset(capabilities, 0, sizeof(struct display_capabilities));
capabilities->x_resolution = CONFIG_DUMMY_DISPLAY_X_RES;
@ -105,7 +105,7 @@ static int dummy_display_set_pixel_format(const struct device *dev,
const enum display_pixel_format pixel_format)
{
struct dummy_display_data *disp_data =
(struct dummy_display_data *)dev->driver_data;
(struct dummy_display_data *)dev->data;
disp_data->current_pixel_format = pixel_format;
return 0;

8
drivers/display/display_ili9340.c
View file

@ -49,7 +49,7 @@ static void ili9340_exit_sleep(struct ili9340_data *data)
static int ili9340_init(struct device *dev)
{
struct ili9340_data *data = (struct ili9340_data *)dev->driver_data;
struct ili9340_data *data = (struct ili9340_data *)dev->data;
LOG_DBG("Initializing display driver");
@ -137,7 +137,7 @@ static int ili9340_write(const struct device *dev, const uint16_t x,
const struct display_buffer_descriptor *desc,
const void *buf)
{
struct ili9340_data *data = (struct ili9340_data *)dev->driver_data;
struct ili9340_data *data = (struct ili9340_data *)dev->data;
const uint8_t *write_data_start = (uint8_t *) buf;
struct spi_buf tx_buf;
struct spi_buf_set tx_bufs;
@ -196,7 +196,7 @@ static void *ili9340_get_framebuffer(const struct device *dev)
static int ili9340_display_blanking_off(const struct device *dev)
{
struct ili9340_data *data = (struct ili9340_data *)dev->driver_data;
struct ili9340_data *data = (struct ili9340_data *)dev->data;
LOG_DBG("Turning display blanking off");
ili9340_transmit(data, ILI9340_CMD_DISPLAY_ON, NULL, 0);
@ -205,7 +205,7 @@ static int ili9340_display_blanking_off(const struct device *dev)
static int ili9340_display_blanking_on(const struct device *dev)
{
struct ili9340_data *data = (struct ili9340_data *)dev->driver_data;
struct ili9340_data *data = (struct ili9340_data *)dev->data;
LOG_DBG("Turning display blanking on");
ili9340_transmit(data, ILI9340_CMD_DISPLAY_OFF, NULL, 0);

6
drivers/display/display_mcux_elcdif.c
View file

@ -45,7 +45,7 @@ static int mcux_elcdif_write(const struct device *dev, const uint16_t x,
const void *buf)
{
const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->driver_data;
struct mcux_elcdif_data *data = dev->data;
uint8_t write_idx = data->write_idx;
uint8_t read_idx = !write_idx;
@ -168,7 +168,7 @@ static void mcux_elcdif_isr(void *arg)
{
struct device *dev = (struct device *)arg;
const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->driver_data;
struct mcux_elcdif_data *data = dev->data;
uint32_t status;
status = ELCDIF_GetInterruptStatus(config->base);
@ -180,7 +180,7 @@ static void mcux_elcdif_isr(void *arg)
static int mcux_elcdif_init(struct device *dev)
{
const struct mcux_elcdif_config *config = dev->config;
struct mcux_elcdif_data *data = dev->driver_data;
struct mcux_elcdif_data *data = dev->data;
int i;
elcdif_rgb_mode_config_t rgb_mode = config->rgb_mode;

14
drivers/display/display_sdl.c
View file

@ -29,7 +29,7 @@ static struct sdl_display_data sdl_display_data;
static int sdl_display_init(struct device *dev)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
LOG_DBG("Initializing display driver");
memset(disp_data, 0, sizeof(struct sdl_display_data));
@ -219,7 +219,7 @@ static int sdl_display_write(const struct device *dev, const uint16_t x,
SDL_Rect rect;
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
LOG_DBG("Writing %dx%d (w,h) bitmap @ %dx%d (x,y)", desc->width,
desc->height, x, y);
@ -278,7 +278,7 @@ static int sdl_display_read(const struct device *dev, const uint16_t x,
void *buf)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
SDL_Rect rect;
rect.x = x;
@ -305,7 +305,7 @@ static void *sdl_display_get_framebuffer(const struct device *dev)
static int sdl_display_blanking_off(const struct device *dev)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
LOG_DBG("Turning display blacking off");
@ -321,7 +321,7 @@ static int sdl_display_blanking_off(const struct device *dev)
static int sdl_display_blanking_on(const struct device *dev)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
LOG_DBG("Turning display blanking on");
@ -348,7 +348,7 @@ static void sdl_display_get_capabilities(
const struct device *dev, struct display_capabilities *capabilities)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
memset(capabilities, 0, sizeof(struct display_capabilities));
capabilities->x_resolution = CONFIG_SDL_DISPLAY_X_RES;
@ -368,7 +368,7 @@ static int sdl_display_set_pixel_format(const struct device *dev,
const enum display_pixel_format pixel_format)
{
struct sdl_display_data *disp_data =
(struct sdl_display_data *)dev->driver_data;
(struct sdl_display_data *)dev->data;
switch (pixel_format) {
case PIXEL_FORMAT_ARGB_8888:

12
drivers/display/display_st7789v.c
View file

@ -115,7 +115,7 @@ static void st7789v_reset_display(struct st7789v_data *data)
static int st7789v_blanking_on(const struct device *dev)
{
struct st7789v_data *driver = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *driver = (struct st7789v_data *)dev->data;
st7789v_transmit(driver, ST7789V_CMD_DISP_OFF, NULL, 0);
return 0;
@ -123,7 +123,7 @@ static int st7789v_blanking_on(const struct device *dev)
static int st7789v_blanking_off(const struct device *dev)
{
struct st7789v_data *driver = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *driver = (struct st7789v_data *)dev->data;
st7789v_transmit(driver, ST7789V_CMD_DISP_ON, NULL, 0);
return 0;
@ -161,7 +161,7 @@ static int st7789v_write(const struct device *dev,
const struct display_buffer_descriptor *desc,
const void *buf)
{
struct st7789v_data *data = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *data = (struct st7789v_data *)dev->data;
const uint8_t *write_data_start = (uint8_t *) buf;
struct spi_buf tx_buf;
struct spi_buf_set tx_bufs;
@ -223,7 +223,7 @@ static int st7789v_set_contrast(const struct device *dev,
static void st7789v_get_capabilities(const struct device *dev,
struct display_capabilities *capabilities)
{
struct st7789v_data *data = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *data = (struct st7789v_data *)dev->data;
memset(capabilities, 0, sizeof(struct display_capabilities));
capabilities->x_resolution = data->width;
@ -336,7 +336,7 @@ static void st7789v_lcd_init(struct st7789v_data *p_st7789v)
static int st7789v_init(struct device *dev)
{
struct st7789v_data *data = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *data = (struct st7789v_data *)dev->data;
data->spi_dev = device_get_binding(DT_INST_BUS_LABEL(0));
if (data->spi_dev == NULL) {
@ -412,7 +412,7 @@ static int st7789v_pm_control(struct device *dev, uint32_t ctrl_command,
void *context, device_pm_cb cb, void *arg)
{
int ret = 0;
struct st7789v_data *data = (struct st7789v_data *)dev->driver_data;
struct st7789v_data *data = (struct st7789v_data *)dev->data;
switch (ctrl_command) {
case DEVICE_PM_SET_POWER_STATE:

10
drivers/display/gd7965.c
View file

@ -112,7 +112,7 @@ static inline void gd7965_busy_wait(struct gd7965_data *driver)
static int gd7965_update_display(const struct device *dev)
{
struct gd7965_data *driver = dev->driver_data;
struct gd7965_data *driver = dev->data;
LOG_DBG("Trigger update sequence");
if (gd7965_write_cmd(driver, GD7965_CMD_DRF, NULL, 0)) {
@ -126,7 +126,7 @@ static int gd7965_update_display(const struct device *dev)
static int gd7965_blanking_off(const struct device *dev)
{
struct gd7965_data *driver = dev->driver_data;
struct gd7965_data *driver = dev->data;
if (blanking_on) {
/* Update EPD pannel in normal mode */
@ -152,7 +152,7 @@ static int gd7965_write(const struct device *dev, const uint16_t x, const uint16
const struct display_buffer_descriptor *desc,
const void *buf)
{
struct gd7965_data *driver = dev->driver_data;
struct gd7965_data *driver = dev->data;
uint16_t x_end_idx = x + desc->width - 1;
uint16_t y_end_idx = y + desc->height - 1;
uint8_t ptl[GD7965_PTL_REG_LENGTH] = {0};
@ -314,7 +314,7 @@ static int gd7965_clear_and_write_buffer(struct device *dev,
static int gd7965_controller_init(struct device *dev)
{
struct gd7965_data *driver = dev->driver_data;
struct gd7965_data *driver = dev->data;
uint8_t tmp[GD7965_TRES_REG_LENGTH];
gpio_pin_set(driver->reset, GD7965_RESET_PIN, 1);
@ -392,7 +392,7 @@ static int gd7965_controller_init(struct device *dev)
static int gd7965_init(struct device *dev)
{
struct gd7965_data *driver = dev->driver_data;
struct gd7965_data *driver = dev->data;
LOG_DBG("");

22
drivers/display/grove_lcd_rgb.c
View file

@ -106,7 +106,7 @@ void glcd_print(struct device *port, char *data, uint32_t size)
{
const struct glcd_driver * const rom = (const struct glcd_driver *)
port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t buf[] = { GLCD_CMD_SET_CGRAM_ADDR, 0 };
int i;
@ -121,7 +121,7 @@ void glcd_cursor_pos_set(struct device *port, uint8_t col, uint8_t row)
{
const struct glcd_driver * const rom = (const struct glcd_driver *)
port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
unsigned char data[2];
@ -142,7 +142,7 @@ void glcd_clear(struct device *port)
{
const struct glcd_driver * const rom = (const struct glcd_driver *)
port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t clear[] = { 0, GLCD_CMD_SCREEN_CLEAR };
i2c_write(dev->i2c, clear, sizeof(clear), rom->lcd_addr);
@ -155,7 +155,7 @@ void glcd_display_state_set(struct device *port, uint8_t opt)
{
const struct glcd_driver * const rom = (const struct glcd_driver *)
port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t data[] = { 0, 0 };
dev->display_switch = opt;
@ -170,7 +170,7 @@ void glcd_display_state_set(struct device *port, uint8_t opt)
uint8_t glcd_display_state_get(struct device *port)
{
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
return dev->display_switch;
}
@ -179,7 +179,7 @@ uint8_t glcd_display_state_get(struct device *port)
void glcd_input_state_set(struct device *port, uint8_t opt)
{
const struct glcd_driver * const rom = port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t data[] = { 0, 0 };
dev->input_set = opt;
@ -193,7 +193,7 @@ void glcd_input_state_set(struct device *port, uint8_t opt)
uint8_t glcd_input_state_get(struct device *port)
{
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
return dev->input_set;
}
@ -213,7 +213,7 @@ void glcd_color_select(struct device *port, uint8_t color)
void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b)
{
struct glcd_data * const dev = port->driver_data;
struct glcd_data * const dev = port->data;
rgb_reg_set(dev->i2c, REGISTER_R, r);
rgb_reg_set(dev->i2c, REGISTER_G, g);
@ -224,7 +224,7 @@ void glcd_color_set(struct device *port, uint8_t r, uint8_t g, uint8_t b)
void glcd_function_set(struct device *port, uint8_t opt)
{
const struct glcd_driver * const rom = port->config;
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t data[] = { 0, 0 };
dev->function = opt;
@ -239,7 +239,7 @@ void glcd_function_set(struct device *port, uint8_t opt)
uint8_t glcd_function_get(struct device *port)
{
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
return dev->function;
}
@ -247,7 +247,7 @@ uint8_t glcd_function_get(struct device *port)
int glcd_initialize(struct device *port)
{
struct glcd_data *dev = port->driver_data;
struct glcd_data *dev = port->data;
uint8_t cmd;
LOG_DBG("initialize called");

20
drivers/display/ssd1306.c
View file

@ -79,7 +79,7 @@ static inline int ssd1306_reg_update(struct ssd1306_data *driver, uint8_t reg,
static inline int ssd1306_set_panel_orientation(struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
SSD1306_CONTROL_BYTE_CMD,
(SSD1306_PANEL_SEGMENT_REMAP ?
@ -97,7 +97,7 @@ static inline int ssd1306_set_panel_orientation(struct device *dev)
static inline int ssd1306_set_timing_setting(struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
SSD1306_CONTROL_BYTE_CMD,
SSD1306_SET_CLOCK_DIV_RATIO,
@ -119,7 +119,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev)
static inline int ssd1306_set_hardware_config(struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
SSD1306_CONTROL_BYTE_CMD,
SSD1306_SET_START_LINE,
@ -143,7 +143,7 @@ static inline int ssd1306_set_hardware_config(struct device *dev)
static inline int ssd1306_set_charge_pump(const struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
#if defined(CONFIG_SSD1306_DEFAULT)
SSD1306_CONTROL_BYTE_CMD,
@ -167,7 +167,7 @@ static inline int ssd1306_set_charge_pump(const struct device *dev)
static int ssd1306_resume(const struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
/* set display on */
return ssd1306_reg_write(driver, SSD1306_CONTROL_LAST_BYTE_CMD,
SSD1306_DISPLAY_ON);
@ -175,7 +175,7 @@ static int ssd1306_resume(const struct device *dev)
static int ssd1306_suspend(const struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
/* set display on */
return ssd1306_reg_write(driver, SSD1306_CONTROL_LAST_BYTE_CMD,
SSD1306_DISPLAY_OFF);
@ -185,7 +185,7 @@ static int ssd1306_write(const struct device *dev, const uint16_t x, const uint1
const struct display_buffer_descriptor *desc,
const void *buf)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
size_t buf_len;
if (desc->pitch < desc->width) {
@ -309,7 +309,7 @@ static int ssd1306_set_brightness(const struct device *dev,
static int ssd1306_set_contrast(const struct device *dev, const uint8_t contrast)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
SSD1306_CONTROL_BYTE_CMD,
SSD1306_SET_CONTRAST_CTRL,
@ -352,7 +352,7 @@ static int ssd1306_set_pixel_format(const struct device *dev,
static int ssd1306_init_device(struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
uint8_t cmd_buf[] = {
SSD1306_CONTROL_BYTE_CMD,
@ -412,7 +412,7 @@ static int ssd1306_init_device(struct device *dev)
static int ssd1306_init(struct device *dev)
{
struct ssd1306_data *driver = dev->driver_data;
struct ssd1306_data *driver = dev->data;
LOG_DBG("");

16
drivers/display/ssd16xx.c
View file

@ -210,7 +210,7 @@ static int ssd16xx_blanking_on(const struct device *dev)
static int ssd16xx_update_display(const struct device *dev)
{
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
int err;
err = ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_CTRL2,
@ -228,7 +228,7 @@ static int ssd16xx_write(const struct device *dev, const uint16_t x,
const struct display_buffer_descriptor *desc,
const void *buf)
{
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
int err;
size_t buf_len;
uint16_t x_start;
@ -387,7 +387,7 @@ static int ssd16xx_set_pixel_format(const struct device *dev,
static int ssd16xx_clear_cntlr_mem(struct device *dev, uint8_t ram_cmd,
bool update)
{
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
uint8_t clear_page[EPD_PANEL_WIDTH];
uint16_t panel_h = EPD_PANEL_HEIGHT /
EPD_PANEL_NUMOF_ROWS_PER_PAGE;
@ -435,7 +435,7 @@ static int ssd16xx_clear_cntlr_mem(struct device *dev, uint8_t ram_cmd,
static inline int ssd16xx_load_ws_from_otp(struct device *dev)
{
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
uint8_t tmp[2];
#if DT_INST_NODE_HAS_PROP(0, tssv)
@ -503,7 +503,7 @@ static inline int ssd16xx_load_ws_from_otp(struct device *dev)
static int ssd16xx_load_ws_initial(struct device *dev)
{
#if DT_INST_NODE_HAS_PROP(0, lut_initial)
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
if (ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_LUT,
ssd16xx_lut_initial,
@ -522,7 +522,7 @@ static int ssd16xx_load_ws_initial(struct device *dev)
static int ssd16xx_load_ws_default(struct device *dev)
{
#if DT_INST_NODE_HAS_PROP(0, lut_default)
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
if (ssd16xx_write_cmd(driver, SSD16XX_CMD_UPDATE_LUT,
ssd16xx_lut_default,
@ -541,7 +541,7 @@ static int ssd16xx_controller_init(struct device *dev)
int err;
uint8_t tmp[3];
size_t len;
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
LOG_DBG("");
@ -643,7 +643,7 @@ static int ssd16xx_controller_init(struct device *dev)
static int ssd16xx_init(struct device *dev)
{
struct ssd16xx_data *driver = dev->driver_data;
struct ssd16xx_data *driver = dev->data;
LOG_DBG("");