mmc: sdhci-*: Don't emit error msg if sdhci_add_host() fails

I noticed below error msg with sdhci-pxav3 on some berlin platforms:

[.....] sdhci-pxav3 f7ab0000.sdhci failed to add host

It is due to getting related vmmc or vqmmc regulator returns
-EPROBE_DEFER. It doesn't matter at all but it's confusing.

>From another side, if driver probing fails and the error number isn't
-EPROBE_DEFER, the core will tell us something as below:

[.....] sdhci-pxav3: probe of f7ab0000.sdhci failed with error -EXX

So it's not necessary to emit error msg if sdhci_add_host() fails. And
some other sdhci host drivers also have this issue, let's fix them
together.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 11ca95c60bcf5738e98ec9f16cd6dd79b5b1c042..bdbd4897c0f7322a5e1dcb287b6ce36921b789f0 100644 (file)
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -284,10 +284,8 @@ static int sdhci_bcm_kona_probe(struct platform_device *pdev)
        sdhci_bcm_kona_sd_init(host);
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(dev, "Failed sdhci_add_host\n");
+       if (ret)
                goto err_reset;
-       }
 
        /* if device is eMMC, emulate card insert right here */
        if (!mmc_card_is_removable(host->mmc)) {

diff --git a/drivers/mmc/host/sdhci-pic32.c b/drivers/mmc/host/sdhci-pic32.c
index a6caa49ca25acb67e62ce7d23c435b70c9624349..a11e6397d4ff815d758c809b76000bdcd4f3421f 100644 (file)
--- a/drivers/mmc/host/sdhci-pic32.c
+++ b/drivers/mmc/host/sdhci-pic32.c
@@ -200,10 +200,8 @@ static int pic32_sdhci_probe(struct platform_device *pdev)
        }
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(&pdev->dev, "error adding host\n");
+       if (ret)
                goto err_base_clk;
-       }
 
        dev_info(&pdev->dev, "Successfully added sdhci host\n");
        return 0;

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index 8986f9d9cf98bc3961f5210db7d88f84722a5c2d..2c3827f54927e5658fc8e12cc70c4ede0e47c3c2 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -221,10 +221,8 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
        host->ops = &pxav2_sdhci_ops;
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add host\n");
+       if (ret)
                goto disable_clk;
-       }
 
        return 0;
 

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index a34434166ca7bcf54d2a426b50bdd765de39c76b..b8e96f39242890982f0815b2731c336dd58cda50 100644 (file)
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -472,10 +472,8 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
        pm_suspend_ignore_children(&pdev->dev, 1);
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add host\n");
+       if (ret)
                goto err_add_host;
-       }
 
        if (host->mmc->pm_caps & MMC_PM_WAKE_SDIO_IRQ)
                device_init_wakeup(&pdev->dev, 1);

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index cda83ccb2702139856a059f9ceef84b650df3a38..9ef89d00970e1abf2c0cf27cfe0aa9e23bd0bdf6 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -655,10 +655,8 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
                goto err_req_regs;
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(dev, "sdhci_add_host() failed\n");
+       if (ret)
                goto err_req_regs;
-       }
 
 #ifdef CONFIG_PM
        if (pdata->cd_type != S3C_SDHCI_CD_INTERNAL)

diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c
index 14511526a3a8f2cbe8379f00fca6a227582c4dda..9247d51f2eed232f08aaf4875a0aacb7034a66d0 100644 (file)
--- a/drivers/mmc/host/sdhci-spear.c
+++ b/drivers/mmc/host/sdhci-spear.c
@@ -126,10 +126,8 @@ static int sdhci_probe(struct platform_device *pdev)
        }
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_dbg(&pdev->dev, "error adding host\n");
+       if (ret)
                goto disable_clk;
-       }
 
        platform_set_drvdata(pdev, host);
 

diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
index c32daed0d418006c11310c086ca289613022d0be..8f95647195d933348c434dfe03b6e53c902ed44b 100644 (file)
--- a/drivers/mmc/host/sdhci-st.c
+++ b/drivers/mmc/host/sdhci-st.c
@@ -422,10 +422,8 @@ static int sdhci_st_probe(struct platform_device *pdev)
        st_mmcss_cconfig(np, host);
 
        ret = sdhci_add_host(host);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed sdhci_add_host\n");
+       if (ret)
                goto err_out;
-       }
 
        host_version = readw_relaxed((host->ioaddr + SDHCI_HOST_VERSION));