diff mbox series

[v1,2/2] mmc: sdhci-pltfm: Make driver OF independent

Message ID 20231006105803.3374241-2-andriy.shevchenko@linux.intel.com
State New
Headers show
Series [v1,1/2] mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init() | expand

Commit Message

Andy Shevchenko Oct. 6, 2023, 10:58 a.m. UTC
Since we have device_is_compatible() API, drop OF dependency
in the driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/mmc/host/sdhci-pltfm.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

Comments

Adrian Hunter Oct. 9, 2023, 4:58 p.m. UTC | #1
On 6/10/23 13:58, Andy Shevchenko wrote:
> Since we have device_is_compatible() API, drop OF dependency
> in the driver.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci-pltfm.c | 16 ++++++----------
>  1 file changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 4d1a703a5bdb..62753d72198a 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -19,7 +19,6 @@
>  #include <linux/err.h>
>  #include <linux/module.h>
>  #include <linux/property.h>
> -#include <linux/of.h>
>  #ifdef CONFIG_PPC
>  #include <asm/machdep.h>
>  #endif
> @@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev)
>  
>  static void sdhci_get_compatibility(struct platform_device *pdev)
>  {
> +	struct device *dev = &pdev->dev;
>  	struct sdhci_host *host = platform_get_drvdata(pdev);
> -	struct device_node *np = pdev->dev.of_node;
>  
> -	if (!np)
> -		return;
> -
> -	if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
> +	if (device_is_compatible(dev, "fsl,p2020-rev1-esdhc"))
>  		host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
>  
> -	if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
> -	    of_device_is_compatible(np, "fsl,p1010-esdhc") ||
> -	    of_device_is_compatible(np, "fsl,t4240-esdhc") ||
> -	    of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
> +	if (device_is_compatible(dev, "fsl,p2020-esdhc") ||
> +	    device_is_compatible(dev, "fsl,p1010-esdhc") ||
> +	    device_is_compatible(dev, "fsl,t4240-esdhc") ||
> +	    device_is_compatible(dev, "fsl,mpc8536-esdhc"))
>  		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
>  }
>
Ulf Hansson Oct. 10, 2023, 2:27 p.m. UTC | #2
On Fri, 6 Oct 2023 at 12:58, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Since we have device_is_compatible() API, drop OF dependency
> in the driver.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-pltfm.c | 16 ++++++----------
>  1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 4d1a703a5bdb..62753d72198a 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -19,7 +19,6 @@
>  #include <linux/err.h>
>  #include <linux/module.h>
>  #include <linux/property.h>
> -#include <linux/of.h>
>  #ifdef CONFIG_PPC
>  #include <asm/machdep.h>
>  #endif
> @@ -56,19 +55,16 @@ static bool sdhci_wp_inverted(struct device *dev)
>
>  static void sdhci_get_compatibility(struct platform_device *pdev)
>  {
> +       struct device *dev = &pdev->dev;
>         struct sdhci_host *host = platform_get_drvdata(pdev);
> -       struct device_node *np = pdev->dev.of_node;
>
> -       if (!np)
> -               return;
> -
> -       if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
> +       if (device_is_compatible(dev, "fsl,p2020-rev1-esdhc"))
>                 host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
>
> -       if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
> -           of_device_is_compatible(np, "fsl,p1010-esdhc") ||
> -           of_device_is_compatible(np, "fsl,t4240-esdhc") ||
> -           of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
> +       if (device_is_compatible(dev, "fsl,p2020-esdhc") ||
> +           device_is_compatible(dev, "fsl,p1010-esdhc") ||
> +           device_is_compatible(dev, "fsl,t4240-esdhc") ||
> +           device_is_compatible(dev, "fsl,mpc8536-esdhc"))
>                 host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
>  }
>
> --
> 2.40.0.1.gaa8946217a0b
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 4d1a703a5bdb..62753d72198a 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -19,7 +19,6 @@ 
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/property.h>
-#include <linux/of.h>
 #ifdef CONFIG_PPC
 #include <asm/machdep.h>
 #endif
@@ -56,19 +55,16 @@  static bool sdhci_wp_inverted(struct device *dev)
 
 static void sdhci_get_compatibility(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	struct sdhci_host *host = platform_get_drvdata(pdev);
-	struct device_node *np = pdev->dev.of_node;
 
-	if (!np)
-		return;
-
-	if (of_device_is_compatible(np, "fsl,p2020-rev1-esdhc"))
+	if (device_is_compatible(dev, "fsl,p2020-rev1-esdhc"))
 		host->quirks |= SDHCI_QUIRK_BROKEN_DMA;
 
-	if (of_device_is_compatible(np, "fsl,p2020-esdhc") ||
-	    of_device_is_compatible(np, "fsl,p1010-esdhc") ||
-	    of_device_is_compatible(np, "fsl,t4240-esdhc") ||
-	    of_device_is_compatible(np, "fsl,mpc8536-esdhc"))
+	if (device_is_compatible(dev, "fsl,p2020-esdhc") ||
+	    device_is_compatible(dev, "fsl,p1010-esdhc") ||
+	    device_is_compatible(dev, "fsl,t4240-esdhc") ||
+	    device_is_compatible(dev, "fsl,mpc8536-esdhc"))
 		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 }