michaelh/zephyr
1
0
Fork 0
Code Releases Activity

disk: convert DT_NODE_HAS_PROP(..,label) to DT_HAS_NODE()

Browse source 
The check for label property is really checking to see if a device
exists and the better way to do that is to use DT_HAS_NODE().  Replace
refernces of DT_NODE_HAS_PROP(DT_INST(...), label) with
DT_HAS_NODE(DT_INST(...)).

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-31 07:19:17 -05:00 • committed by Kumar Gala
commit 646f12383a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/disk/disk_access_spi_sdhc.c
View file

@ -20,7 +20,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
#if !DT_NODE_HAS_PROP(DT_INST(0, zephyr_mmc_spi_slot), label) #if !DT_HAS_NODE(DT_INST(0, zephyr_mmc_spi_slot))
#warning NO SDHC slot specified on board #warning NO SDHC slot specified on board
#else #else
struct sdhc_spi_data { struct sdhc_spi_data {

8
subsys/disk/disk_access_usdhc.c
View file

@ -2705,7 +2705,7 @@ static int usdhc_access_init(const struct device *dev)
(void)k_mutex_lock(&z_usdhc_init_lock, K_FOREVER); (void)k_mutex_lock(&z_usdhc_init_lock, K_FOREVER);
memset((char *)priv, 0, sizeof(struct usdhc_priv)); memset((char *)priv, 0, sizeof(struct usdhc_priv));
#if DT_NODE_HAS_PROP(DT_INST(0, nxp_imx_usdhc), label) #if DT_HAS_NODE(DT_INST(0, nxp_imx_usdhc))
if (!strcmp(dev->config->name, DT_LABEL(DT_INST(0, nxp_imx_usdhc)))) { if (!strcmp(dev->config->name, DT_LABEL(DT_INST(0, nxp_imx_usdhc)))) {
priv->host_config.base = priv->host_config.base =
(USDHC_Type *)DT_REG_ADDR(DT_INST(0, nxp_imx_usdhc)); (USDHC_Type *)DT_REG_ADDR(DT_INST(0, nxp_imx_usdhc));
@ -2721,7 +2721,7 @@ static int usdhc_access_init(const struct device *dev)
} }
#endif #endif
#if DT_NODE_HAS_PROP(DT_INST(1, nxp_imx_usdhc), label) #if DT_HAS_NODE(DT_INST(1, nxp_imx_usdhc))
if (!strcmp(dev->config->name, DT_LABEL(DT_INST(1, nxp_imx_usdhc)))) { if (!strcmp(dev->config->name, DT_LABEL(DT_INST(1, nxp_imx_usdhc)))) {
priv->host_config.base = priv->host_config.base =
(USDHC_Type *)DT_REG_ADDR(DT_INST(1, nxp_imx_usdhc)); (USDHC_Type *)DT_REG_ADDR(DT_INST(1, nxp_imx_usdhc));
@ -2876,7 +2876,7 @@ static int disk_usdhc_init(struct device *dev)
#ifdef CONFIG_DISK_ACCESS_USDHC1 #ifdef CONFIG_DISK_ACCESS_USDHC1
static struct usdhc_priv usdhc_priv_1; static struct usdhc_priv usdhc_priv_1;
#if DT_NODE_HAS_PROP(DT_INST(0, nxp_imx_usdhc), label) #if DT_HAS_NODE(DT_INST(0, nxp_imx_usdhc))
DEVICE_AND_API_INIT(usdhc_dev1, DEVICE_AND_API_INIT(usdhc_dev1,
DT_LABEL(DT_INST(0, nxp_imx_usdhc)), disk_usdhc_init, DT_LABEL(DT_INST(0, nxp_imx_usdhc)), disk_usdhc_init,
&usdhc_priv_1, NULL, APPLICATION, &usdhc_priv_1, NULL, APPLICATION,
@ -2889,7 +2889,7 @@ DEVICE_AND_API_INIT(usdhc_dev1,
#ifdef CONFIG_DISK_ACCESS_USDHC2 #ifdef CONFIG_DISK_ACCESS_USDHC2
static struct usdhc_priv usdhc_priv_2; static struct usdhc_priv usdhc_priv_2;
#if DT_NODE_HAS_PROP(DT_INST(1, nxp_imx_usdhc), label) #if DT_HAS_NODE(DT_INST(1, nxp_imx_usdhc))
DEVICE_AND_API_INIT(usdhc_dev2, DEVICE_AND_API_INIT(usdhc_dev2,
DT_LABEL(DT_INST(1, nxp_imx_usdhc)), disk_usdhc_init, DT_LABEL(DT_INST(1, nxp_imx_usdhc)), disk_usdhc_init,
usdhc_priv_2, NULL, APPLICATION, usdhc_priv_2, NULL, APPLICATION,