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
subsys/disk/disk_access_spi_sdhc.c
View file

@ -764,7 +764,7 @@ static int disk_spi_sdhc_init(struct device *dev);
static int sdhc_spi_init(struct device *dev)
{
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
data->spi = device_get_binding(DT_BUS_LABEL(DT_INST(0, zephyr_mmc_spi_slot)));
@ -787,7 +787,7 @@ static int sdhc_spi_init(struct device *dev)
static int disk_spi_sdhc_access_status(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
return data->status;
}
@ -796,7 +796,7 @@ static int disk_spi_sdhc_access_read(struct disk_info *disk,
uint8_t *buf, uint32_t sector, uint32_t count)
{
struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
int err;
LOG_DBG("sector=%u count=%u", sector, count);
@ -814,7 +814,7 @@ static int disk_spi_sdhc_access_write(struct disk_info *disk,
const uint8_t *buf, uint32_t sector, uint32_t count)
{
struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
int err;
LOG_DBG("sector=%u count=%u", sector, count);
@ -832,7 +832,7 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk,
uint8_t cmd, void *buf)
{
struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
int err;
err = sdhc_map_disk_status(data->status);
@ -862,7 +862,7 @@ static int disk_spi_sdhc_access_ioctl(struct disk_info *disk,
static int disk_spi_sdhc_access_init(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
int err;
err = sdhc_spi_detect(data);
@ -886,7 +886,7 @@ static struct disk_info spi_sdhc_disk = {
static int disk_spi_sdhc_init(struct device *dev)
{
struct sdhc_spi_data *data = dev->driver_data;
struct sdhc_spi_data *data = dev->data;
data->status = DISK_STATUS_UNINIT;

12
subsys/disk/disk_access_stm32_sdmmc.c
View file

@ -85,7 +85,7 @@ static int stm32_sdmmc_clock_disable(struct stm32_sdmmc_priv *priv)
static int stm32_sdmmc_access_init(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
if (priv->status == DISK_STATUS_OK) {
@ -121,7 +121,7 @@ static void stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
static int stm32_sdmmc_access_status(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
return priv->status;
}
@ -130,7 +130,7 @@ static int stm32_sdmmc_access_read(struct disk_info *disk, uint8_t *data_buf,
uint32_t start_sector, uint32_t num_sector)
{
struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
err = HAL_SD_ReadBlocks(&priv->hsd, data_buf, start_sector,
@ -151,7 +151,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
uint32_t start_sector, uint32_t num_sector)
{
struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
err = HAL_SD_WriteBlocks(&priv->hsd, (uint8_t *)data_buf, start_sector,
@ -170,7 +170,7 @@ static int stm32_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd,
void *buff)
{
struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
HAL_SD_CardInfoTypeDef info;
int err;
@ -352,7 +352,7 @@ static int stm32_sdmmc_pwr_uninit(struct stm32_sdmmc_priv *priv)
static int disk_stm32_sdmmc_init(struct device *dev)
{
struct stm32_sdmmc_priv *priv = dev->driver_data;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
k_work_init(&priv->work, stm32_sdmmc_cd_handler);

14
subsys/disk/disk_access_usdhc.c
View file

@ -2659,7 +2659,7 @@ static int usdhc_board_access_init(struct usdhc_priv *priv)
static int usdhc_access_init(const struct device *dev)
{
const struct usdhc_config *config = dev->config;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
int ret;
(void)k_mutex_lock(&z_usdhc_init_lock, K_FOREVER);
@ -2709,7 +2709,7 @@ static int usdhc_access_init(const struct device *dev)
static int disk_usdhc_access_status(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
return priv->status;
}
@ -2718,7 +2718,7 @@ static int disk_usdhc_access_read(struct disk_info *disk, uint8_t *buf,
uint32_t sector, uint32_t count)
{
struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
LOG_DBG("sector=%u count=%u", sector, count);
@ -2729,7 +2729,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const uint8_t *buf,
uint32_t sector, uint32_t count)
{
struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
LOG_DBG("sector=%u count=%u", sector, count);
@ -2739,7 +2739,7 @@ static int disk_usdhc_access_write(struct disk_info *disk, const uint8_t *buf,
static int disk_usdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *buf)
{
struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
int err;
err = sdhc_map_disk_status(priv->status);
@ -2769,7 +2769,7 @@ static int disk_usdhc_access_ioctl(struct disk_info *disk, uint8_t cmd, void *bu
static int disk_usdhc_access_init(struct disk_info *disk)
{
struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
if (priv->status == DISK_STATUS_OK) {
/* Called twice, don't re-init. */
@ -2794,7 +2794,7 @@ static struct disk_info usdhc_disk = {
static int disk_usdhc_init(struct device *dev)
{
struct usdhc_priv *priv = dev->driver_data;
struct usdhc_priv *priv = dev->data;
priv->status = DISK_STATUS_UNINIT;