michaelh/zephyr
1
0
Fork 0
Code Releases Activity

disk: sdhc: Convert drivers to new DT device macros

Browse source 
Convert sdhc drivers from:

	DEVICE_AND_API_INIT -> DEVICE_DT_INST_DEFINE
	DEVICE_DECLARE -> DEVICE_DT_INST_DECLARE

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-12-14 10:55:33 -06:00 • committed by Maureen Helm
commit 07d1e4a45b
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/disk/disk_access_spi_sdhc.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define DT_DRV_COMPAT zephyr_mmc_spi_slot
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL); LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL);
@ -20,7 +22,7 @@ LOG_MODULE_REGISTER(sdhc_spi, CONFIG_DISK_LOG_LEVEL);
/* Clock speed used after initialisation */ /* Clock speed used after initialisation */
#define SDHC_SPI_SPEED 4000000 #define SDHC_SPI_SPEED 4000000
#define SPI_SDHC_NODE DT_INST(0, zephyr_mmc_spi_slot) #define SPI_SDHC_NODE DT_DRV_INST(0)
#if !DT_NODE_HAS_STATUS(SPI_SDHC_NODE, okay) #if !DT_NODE_HAS_STATUS(SPI_SDHC_NODE, okay)
#warning NO SDHC slot specified on board #warning NO SDHC slot specified on board
@ -39,7 +41,7 @@ struct sdhc_spi_data {
#endif #endif
}; };
DEVICE_DECLARE(sdhc_spi_0); DEVICE_DT_INST_DECLARE(0);
/* Traces card traffic for LOG_LEVEL_DBG */ /* Traces card traffic for LOG_LEVEL_DBG */
static int sdhc_spi_trace(struct sdhc_spi_data *data, int dir, int err, static int sdhc_spi_trace(struct sdhc_spi_data *data, int dir, int err,
@ -977,8 +979,7 @@ static int disk_spi_sdhc_init(const struct device *dev)
static struct sdhc_spi_data sdhc_spi_data_0; static struct sdhc_spi_data sdhc_spi_data_0;
DEVICE_AND_API_INIT(sdhc_spi_0, DEVICE_DT_INST_DEFINE(0, sdhc_spi_init, device_pm_control_nop,
DT_LABEL(SPI_SDHC_NODE), &sdhc_spi_data_0, NULL,
sdhc_spi_init, &sdhc_spi_data_0, NULL,
APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL); APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
#endif #endif

3
subsys/disk/disk_access_stm32_sdmmc.c
View file

@ -434,8 +434,7 @@ static struct stm32_sdmmc_priv stm32_sdmmc_priv_1 = {
} }
}; };
DEVICE_AND_API_INIT(stm32_sdmmc_dev1, DEVICE_DT_INST_DEFINE(0, disk_stm32_sdmmc_init, device_pm_control_nop,
DT_INST_LABEL(0), disk_stm32_sdmmc_init,
&stm32_sdmmc_priv_1, NULL, APPLICATION, &stm32_sdmmc_priv_1, NULL, APPLICATION,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
NULL); NULL);

4
subsys/disk/disk_access_usdhc.c
View file

@ -2845,9 +2845,9 @@ static int disk_usdhc_init(const struct device *dev)
\ \
static struct usdhc_priv usdhc_priv_##n; \ static struct usdhc_priv usdhc_priv_##n; \
\ \
DEVICE_AND_API_INIT(usdhc_dev##n, \ DEVICE_DT_INST_DEFINE(n, \
DT_INST_LABEL(n), \
&disk_usdhc_init, \ &disk_usdhc_init, \
device_pm_control_nop, \
&usdhc_priv_##n, \ &usdhc_priv_##n, \
&usdhc_config_##n, \ &usdhc_config_##n, \
APPLICATION, \ APPLICATION, \