Skip to contentSkip to conversation

mmc: sdhci-esdhc-imx: Remove non-DT stub

PATCH In review Fabio Estevam 2 participants 4 messages Mar 14, 2021 – Mar 19, 2021

Subsystems (4)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 mmc: sdhci-esdhc-imx: Remove non-DT stub

i.MX has been converted to a devicetree only platform, so remove the non-DT stub for sdhci_esdhc_imx_probe_dt().

Also, make the driver depend on OF now.

---
Changes since v1:
- Fix typo in Subject: immc --> mmc

 drivers/mmc/host/Kconfig           |  1 +
 drivers/mmc/host/sdhci-esdhc-imx.c | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)
drivers/mmc/host/Kconfig +1 -0
index b236dfe2e879..e911eb570fbc 100644
@@ -278,6 +278,7 @@ config MMC_SDHCI_ESDHC_IMX
 	tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller"
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on MMC_SDHCI_PLTFM
+	depends on OF
 	select MMC_SDHCI_IO_ACCESSORS
 	select MMC_CQHCI
 	help
drivers/mmc/host/sdhci-esdhc-imx.c +0 -10
index 94327988da91..2a1fb1cd4433 100644
@@ -1453,7 +1453,6 @@ static const struct cqhci_host_ops esdhc_cqhci_ops = {
 	.dumpregs	= esdhc_sdhci_dumpregs,
 };
 
-#ifdef CONFIG_OF
 static int
 sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 			 struct sdhci_host *host,
@@ -1505,15 +1504,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
 	return 0;
 }
-#else
-static inline int
-sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
-			 struct sdhci_host *host,
-			 struct pltfm_imx_data *imx_data)
-{
-	return -ENODEV;
-}
-#endif
 
 static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 {
Signature · 1 line
2.25.1
author reviewer
#1 lore raw

PATCH v2 2/2 mmc: sdhci-esdhc-imx: Use device_get_match_data()

The retrieval of driver data can be a bit simplified by using device_get_match_data(), so switch to it.

---
Changes since v1:
- None

 drivers/mmc/host/sdhci-esdhc-imx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -3
index 2a1fb1cd4433..d309cc620fdc 100644
@@ -1507,8 +1507,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
 static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 {
-	const struct of_device_id *of_id =
-			of_match_device(imx_esdhc_dt_ids, &pdev->dev);
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_host *host;
 	struct cqhci_host *cq_host;
@@ -1524,7 +1522,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 
 	imx_data = sdhci_pltfm_priv(pltfm_host);
 
-	imx_data->socdata = of_id->data;
+	imx_data->socdata = device_get_match_data(&pdev->dev);
 
 	if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
 		cpu_latency_qos_add_request(&imx_data->pm_qos_req, 0);
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v2 2/2] mmc: sdhci-esdhc-imx: Use device_get_match_data()

Quoted 5 lines · Fabio Estevam

The retrieval of driver data can be a bit simplified by using device_get_match_data(), so switch to it.

Applied for next, thanks!

Kind regards
Uffe

Quoted 32 lines

---
Changes since v1:
- None

 drivers/mmc/host/sdhci-esdhc-imx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -4
index 2a1fb1cd4433..d309cc620fdc 100644
@@ -1507,8 +1507,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
 static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 {
-       const struct of_device_id *of_id =
-                       of_match_device(imx_esdhc_dt_ids, &pdev->dev);
        struct sdhci_pltfm_host *pltfm_host;
        struct sdhci_host *host;
        struct cqhci_host *cq_host;
@@ -1524,7 +1522,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 
        imx_data = sdhci_pltfm_priv(pltfm_host);
 
-       imx_data->socdata = of_id->data;
+       imx_data->socdata = device_get_match_data(&pdev->dev);
 
        if (imx_data->socdata->flags & ESDHC_FLAG_PMQOS)
                cpu_latency_qos_add_request(&imx_data->pm_qos_req, 0);
--

2.25.1

#3 lore raw
In reply to Fabio Estevam
Quoted 7 lines · Fabio Estevam

i.MX has been converted to a devicetree only platform, so remove the non-DT stub for sdhci_esdhc_imx_probe_dt().

Also, make the driver depend on OF now.

Applied for next, thanks!

Kind regards
Uffe

Quoted 51 lines

---
Changes since v1:
- Fix typo in Subject: immc --> mmc

 drivers/mmc/host/Kconfig           |  1 +
 drivers/mmc/host/sdhci-esdhc-imx.c | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)
drivers/mmc/host/Kconfig +1 -0
index b236dfe2e879..e911eb570fbc 100644
@@ -278,6 +278,7 @@ config MMC_SDHCI_ESDHC_IMX
        tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller"
        depends on ARCH_MXC || COMPILE_TEST
        depends on MMC_SDHCI_PLTFM
+       depends on OF
        select MMC_SDHCI_IO_ACCESSORS
        select MMC_CQHCI
        help
drivers/mmc/host/sdhci-esdhc-imx.c +0 -11
index 94327988da91..2a1fb1cd4433 100644
@@ -1453,7 +1453,6 @@ static const struct cqhci_host_ops esdhc_cqhci_ops = {
        .dumpregs       = esdhc_sdhci_dumpregs,
 };
 
-#ifdef CONFIG_OF
 static int
 sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
                         struct sdhci_host *host,
@@ -1505,15 +1504,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
        return 0;
 }
-#else
-static inline int
-sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
-                        struct sdhci_host *host,
-                        struct pltfm_imx_data *imx_data)
-{
-       return -ENODEV;
-}
-#endif
 
 static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 {
--

2.25.1