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>
This commit is contained in:
Родитель
a0d476654a
Коммит
fb8617e1ee
|
@ -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)) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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));
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче