mmc: sdhci-pltfm: Do not use parent as the host's device

The code selecting a device for the sdhci host has been
continuously tweaked (8cbf1b0f801b0cae382488dfd63cf9f4871f578d
"mmc: sdhci-pltfm: Add structure for host-specific data" and
2c84597910aced2e82587375b63d6cd787eee7a9 "mmc: sdhci-pltfm: dt
device does not pass parent to sdhci_alloc_host" while there
does not seem to be any reason to use platform device's parent
in the first place.

The comment saying "Some PCI-based MFD need the parent here"
seem to refer to Timberdale FPGA driver (the only MFD driver
registering SDHCI cell, drivers/mfd/timberdale.c) but again,
the only situation when parent device matter is runtime PM,
which is not implemented for Timberdale.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 7e834fb78f427d2c085dce62956337d126e7e4f3..c5b01d6bb85d41fdf236473b4f2b25cae9ee68f5 100644 (file)
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -123,7 +123,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
                                    size_t priv_size)
 {
        struct sdhci_host *host;
-       struct device_node *np = pdev->dev.of_node;
        struct resource *iomem;
        int ret;
 
@@ -136,13 +135,8 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
        if (resource_size(iomem) < 0x100)
                dev_err(&pdev->dev, "Invalid iomem size!\n");
 
-       /* Some PCI-based MFD need the parent here */
-       if (pdev->dev.parent != &platform_bus && !np)
-               host = sdhci_alloc_host(pdev->dev.parent,
-                       sizeof(struct sdhci_pltfm_host) + priv_size);
-       else
-               host = sdhci_alloc_host(&pdev->dev,
-                       sizeof(struct sdhci_pltfm_host) + priv_size);
+       host = sdhci_alloc_host(&pdev->dev,
+               sizeof(struct sdhci_pltfm_host) + priv_size);
 
        if (IS_ERR(host)) {
                ret = PTR_ERR(host);