Skip to contentSkip to conversation

mmc: Use of_property_present() for non-boolean properties

PATCH In review Rob Herring (Arm) 2 participants 2 messages Jan 9, 2025 – Jan 13, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mmc: Use of_property_present() for non-boolean properties

The use of of_property_read_bool() for non-boolean properties is deprecated in favor of of_property_present() when testing for property presence.

---
v2:
- Drop initialization of dat3_card_detect
- Rebase on next-20250109

---
 drivers/mmc/host/mxcmmc.c          | 8 ++++----
 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/mmc/host/mxcmmc.c +4 -4
index e7a286c3216f..0a9affd12532 100644
@@ -995,7 +995,7 @@ static int mxcmci_probe(struct platform_device *pdev)
 	struct mxcmci_host *host;
 	struct resource *res;
 	int ret = 0, irq;
-	bool dat3_card_detect = false;
+	bool dat3_card_detect;
 	dma_cap_mask_t mask;
 	struct imxmmc_platform_data *pdata = pdev->dev.platform_data;
 
@@ -1048,9 +1048,9 @@ static int mxcmci_probe(struct platform_device *pdev)
 
 	if (pdata)
 		dat3_card_detect = pdata->dat3_card_detect;
-	else if (mmc_card_is_removable(mmc)
-			&& !of_property_read_bool(pdev->dev.of_node, "cd-gpios"))
-		dat3_card_detect = true;
+	else
+		dat3_card_detect = mmc_card_is_removable(mmc) &&
+				   !of_property_present(pdev->dev.of_node, "cd-gpios");
 
 	ret = mmc_regulator_get_supply(mmc);
 	if (ret)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -1
index e23177ea9d91..ff78a7c6a04c 100644
@@ -1648,7 +1648,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 	 * Retrieving and requesting the actual WP GPIO will happen
 	 * in the call to mmc_of_parse().
 	 */
-	if (of_property_read_bool(np, "wp-gpios"))
+	if (of_property_present(np, "wp-gpios"))
 		boarddata->wp_type = ESDHC_WP_GPIO;
 
 	of_property_read_u32(np, "fsl,tuning-step", &boarddata->tuning_step);
Signature · 1 line
2.45.2
#1 lore raw
Quoted 9 lines · Rob Herring (Arm)

The use of of_property_read_bool() for non-boolean properties is deprecated in favor of of_property_present() when testing for property presence.

Applied for next, thanks!

Kind regards
Uffe

Quoted 51 lines

---
v2:
- Drop initialization of dat3_card_detect
- Rebase on next-20250109

---
 drivers/mmc/host/mxcmmc.c          | 8 ++++----
 drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/mmc/host/mxcmmc.c +4 -4
index e7a286c3216f..0a9affd12532 100644
@@ -995,7 +995,7 @@ static int mxcmci_probe(struct platform_device *pdev)
        struct mxcmci_host *host;
        struct resource *res;
        int ret = 0, irq;
-       bool dat3_card_detect = false;
+       bool dat3_card_detect;
        dma_cap_mask_t mask;
        struct imxmmc_platform_data *pdata = pdev->dev.platform_data;
 
@@ -1048,9 +1048,9 @@ static int mxcmci_probe(struct platform_device *pdev)
 
        if (pdata)
                dat3_card_detect = pdata->dat3_card_detect;
-       else if (mmc_card_is_removable(mmc)
-                       && !of_property_read_bool(pdev->dev.of_node, "cd-gpios"))
-               dat3_card_detect = true;
+       else
+               dat3_card_detect = mmc_card_is_removable(mmc) &&
+                                  !of_property_present(pdev->dev.of_node, "cd-gpios");
 
        ret = mmc_regulator_get_supply(mmc);
        if (ret)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -2
index e23177ea9d91..ff78a7c6a04c 100644
@@ -1648,7 +1648,7 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
         * Retrieving and requesting the actual WP GPIO will happen
         * in the call to mmc_of_parse().
         */
-       if (of_property_read_bool(np, "wp-gpios"))
+       if (of_property_present(np, "wp-gpios"))
                boarddata->wp_type = ESDHC_WP_GPIO;
 
        of_property_read_u32(np, "fsl,tuning-step", &boarddata->tuning_step);
--

2.45.2