[PATCH 2/3] mmc: sdhci-pltfm: dt device does not pass parent to sdhci_alloc_host

[Grant Likely]

On Sun, Jul 03, 2011 at 04:30:50PM +0800, Shawn Guo wrote:
> Neither platform based nor dt based device needs to pass the parent
> to sdhci_alloc_host.  There is no difference between platform and dt
> on this point.
> 
> The patch makes the change to pass device itself than its parent to
> sdhci_alloc_host for dt case too.  Otherwise the probe function of
> sdhci based drivers which is shared between platform and dt will
> fail on dt case.
> 
> Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
> Cc: Chris Ball <cjb at laptop.org>
> Cc: Grant Likely <grant.likely at secretlab.ca>

Acked-by: Grant Likely <grant.likely at secretlab.ca>

> ---
>  drivers/mmc/host/sdhci-pltfm.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
> index 71c0ce1..6414efe 100644
> --- a/drivers/mmc/host/sdhci-pltfm.c
> +++ b/drivers/mmc/host/sdhci-pltfm.c
> @@ -85,6 +85,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
>  {
>  	struct sdhci_host *host;
>  	struct sdhci_pltfm_host *pltfm_host;
> +	struct device_node *np = pdev->dev.of_node;
>  	struct resource *iomem;
>  	int ret;
>  
> @@ -98,7 +99,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
>  		dev_err(&pdev->dev, "Invalid iomem size!\n");
>  
>  	/* Some PCI-based MFD need the parent here */
> -	if (pdev->dev.parent != &platform_bus)
> +	if (pdev->dev.parent != &platform_bus && !np)
>  		host = sdhci_alloc_host(pdev->dev.parent, sizeof(*pltfm_host));
>  	else
>  		host = sdhci_alloc_host(&pdev->dev, sizeof(*pltfm_host));
> -- 
> 1.7.4.1
>