michaelh/zephyr
1
0
Fork 0
Code Releases Activity

device: Const-ify all device driver instance pointers

Browse source 
Now that device_api attribute is unmodified at runtime, as well as all
the other attributes, it is possible to switch all device driver
instance to be constant.

A coccinelle rule is used for this:

@r_const_dev_1
  disable optional_qualifier
@
@@
-struct device *
+const struct device *

@r_const_dev_2
 disable optional_qualifier
@
@@
-struct device * const
+const struct device *

Fixes #27399

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2020-04-30 20:33:38 +02:00 • committed by Carles Cufí
commit e18fcbba5a
1426 changed files with 9356 additions and 8368 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/disk/disk_access.c
View file

@ -169,7 +169,7 @@ unreg_err:
return rc;
}
static int disk_init(struct device *dev)
static int disk_init(const struct device *dev)
{
ARG_UNUSED(dev);

4
subsys/disk/disk_access_flash.c
View file

@ -16,7 +16,7 @@
#define SECTOR_SIZE 512
static struct device *flash_dev;
static const struct device *flash_dev;
/* flash read-copy-erase-write operation */
static uint8_t __aligned(4) read_copy_buf[CONFIG_DISK_ERASE_BLOCK_SIZE];
@ -289,7 +289,7 @@ static struct disk_info flash_disk = {
.ops = &flash_disk_ops,
};
static int disk_flash_init(struct device *dev)
static int disk_flash_init(const struct device *dev)
{
ARG_UNUSED(dev);

2
subsys/disk/disk_access_ram.c
View file

@ -95,7 +95,7 @@ static struct disk_info ram_disk = {
.ops = &ram_disk_ops,
};
static int disk_ram_init(struct device *dev)
static int disk_ram_init(const struct device *dev)
{
ARG_UNUSED(dev);

18
subsys/disk/disk_access_spi_sdhc.c
View file

@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL);
#warning NO SDHC slot specified on board
#else
struct sdhc_spi_data {
struct device *spi;
const struct device *spi;
struct spi_config cfg;
#if DT_SPI_DEV_HAS_CS_GPIOS(SPI_SDHC_NODE)
struct spi_cs_control cs;
@ -748,9 +748,9 @@ error:
return err;
}
static int disk_spi_sdhc_init(struct device *dev);
static int disk_spi_sdhc_init(const struct device *dev);
static int sdhc_spi_init(struct device *dev)
static int sdhc_spi_init(const struct device *dev)
{
struct sdhc_spi_data *data = dev->data;
@ -777,7 +777,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;
const struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->data;
return data->status;
@ -786,7 +786,7 @@ static int disk_spi_sdhc_access_status(struct disk_info *disk)
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;
const struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->data;
int err;
@ -804,7 +804,7 @@ static int disk_spi_sdhc_access_read(struct disk_info *disk,
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;
const struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->data;
int err;
@ -822,7 +822,7 @@ static int disk_spi_sdhc_access_write(struct disk_info *disk,
static int disk_spi_sdhc_access_ioctl(struct disk_info *disk,
uint8_t cmd, void *buf)
{
struct device *dev = disk->dev;
const struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->data;
int err;
@ -852,7 +852,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;
const struct device *dev = disk->dev;
struct sdhc_spi_data *data = dev->data;
int err;
@ -875,7 +875,7 @@ static struct disk_info spi_sdhc_disk = {
.ops = &spi_sdhc_disk_ops,
};
static int disk_spi_sdhc_init(struct device *dev)
static int disk_spi_sdhc_init(const struct device *dev)
{
struct sdhc_spi_data *data = dev->data;

22
subsys/disk/disk_access_stm32_sdmmc.c
View file

@ -23,13 +23,13 @@ struct stm32_sdmmc_priv {
struct gpio_callback cd_cb;
struct {
const char *name;
struct device *port;
const struct device *port;
int pin;
int flags;
} cd;
struct {
const char *name;
struct device *port;
const struct device *port;
int pin;
int flags;
} pe;
@ -38,7 +38,7 @@ struct stm32_sdmmc_priv {
static int stm32_sdmmc_clock_enable(struct stm32_sdmmc_priv *priv)
{
struct device *clock;
const struct device *clock;
#if CONFIG_SOC_SERIES_STM32L4X
LL_RCC_PLLSAI1_Disable();
@ -71,7 +71,7 @@ static int stm32_sdmmc_clock_enable(struct stm32_sdmmc_priv *priv)
static int stm32_sdmmc_clock_disable(struct stm32_sdmmc_priv *priv)
{
struct device *clock;
const struct device *clock;
clock = device_get_binding(STM32_CLOCK_CONTROL_NAME);
if (!clock) {
@ -84,7 +84,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;
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
@ -120,7 +120,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;
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
return priv->status;
@ -129,7 +129,7 @@ static int stm32_sdmmc_access_status(struct disk_info *disk)
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;
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
@ -150,7 +150,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
const uint8_t *data_buf,
uint32_t start_sector, uint32_t num_sector)
{
struct device *dev = disk->dev;
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
int err;
@ -169,7 +169,7 @@ static int stm32_sdmmc_access_write(struct disk_info *disk,
static int stm32_sdmmc_access_ioctl(struct disk_info *disk, uint8_t cmd,
void *buff)
{
struct device *dev = disk->dev;
const struct device *dev = disk->dev;
struct stm32_sdmmc_priv *priv = dev->data;
HAL_SD_CardInfoTypeDef info;
int err;
@ -251,7 +251,7 @@ static void stm32_sdmmc_cd_handler(struct k_work *item)
}
}
static void stm32_sdmmc_cd_callback(struct device *gpiodev,
static void stm32_sdmmc_cd_callback(const struct device *gpiodev,
struct gpio_callback *cb,
uint32_t pin)
{
@ -350,7 +350,7 @@ static int stm32_sdmmc_pwr_uninit(struct stm32_sdmmc_priv *priv)
return 0;
}
static int disk_stm32_sdmmc_init(struct device *dev)
static int disk_stm32_sdmmc_init(const struct device *dev)
{
struct stm32_sdmmc_priv *priv = dev->data;
int err;

26
subsys/disk/disk_access_usdhc.c
View file

@ -453,14 +453,14 @@ struct usdhc_priv {
bool host_ready;
uint8_t status;
struct device *pwr_gpio;
struct device *detect_gpio;
const struct device *pwr_gpio;
const struct device *detect_gpio;
struct gpio_callback detect_cb;
enum host_detect_type detect_type;
bool inserted;
struct device *clock_dev;
const struct device *clock_dev;
uint32_t src_clk_hz;
const struct usdhc_config *config;
@ -2223,7 +2223,7 @@ static void usdhc_host_hw_init(USDHC_Type *base,
}
static void usdhc_cd_gpio_cb(struct device *dev,
static void usdhc_cd_gpio_cb(const struct device *dev,
struct gpio_callback *cb, uint32_t pins)
{
struct usdhc_priv *priv =
@ -2233,9 +2233,9 @@ static void usdhc_cd_gpio_cb(struct device *dev,
gpio_pin_interrupt_configure(dev, config->detect_pin, GPIO_INT_DISABLE);
}
static int usdhc_cd_gpio_init(struct device *detect_gpio,
uint32_t pin, gpio_dt_flags_t flags,
struct gpio_callback *callback)
static int usdhc_cd_gpio_init(const struct device *detect_gpio,
uint32_t pin, gpio_dt_flags_t flags,
struct gpio_callback *callback)
{
int ret;
@ -2708,7 +2708,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;
const struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->data;
return priv->status;
@ -2717,7 +2717,7 @@ static int disk_usdhc_access_status(struct disk_info *disk)
static int disk_usdhc_access_read(struct disk_info *disk, uint8_t *buf,
uint32_t sector, uint32_t count)
{
struct device *dev = disk->dev;
const struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->data;
LOG_DBG("sector=%u count=%u", sector, count);
@ -2728,7 +2728,7 @@ static int disk_usdhc_access_read(struct disk_info *disk, uint8_t *buf,
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;
const struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->data;
LOG_DBG("sector=%u count=%u", sector, count);
@ -2738,7 +2738,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;
const struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->data;
int err;
@ -2768,7 +2768,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;
const struct device *dev = disk->dev;
struct usdhc_priv *priv = dev->data;
if (priv->status == DISK_STATUS_OK) {
@ -2792,7 +2792,7 @@ static struct disk_info usdhc_disk = {
.ops = &usdhc_disk_ops,
};
static int disk_usdhc_init(struct device *dev)
static int disk_usdhc_init(const struct device *dev)
{
struct usdhc_priv *priv = dev->data;