Skip to contentSkip to conversation

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

PATCH Applied Jisheng Zhang 5 participants 5 messages May 25, 2018 – May 28, 2018

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Quoted 1 line

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.

---
 drivers/mmc/host/sdhci-bcm-kona.c | 4 +---
 drivers/mmc/host/sdhci-pic32.c    | 4 +---
 drivers/mmc/host/sdhci-pxav2.c    | 4 +---
 drivers/mmc/host/sdhci-pxav3.c    | 4 +---
 drivers/mmc/host/sdhci-s3c.c      | 4 +---
 drivers/mmc/host/sdhci-spear.c    | 4 +---
 drivers/mmc/host/sdhci-st.c       | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)
drivers/mmc/host/sdhci-bcm-kona.c +1 -3
index 11ca95c60bcf..bdbd4897c0f7 100644
@@ -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)) {
drivers/mmc/host/sdhci-pic32.c +1 -3
index a6caa49ca25a..a11e6397d4ff 100644
@@ -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;
drivers/mmc/host/sdhci-pxav2.c +1 -3
index 8986f9d9cf98..2c3827f54927 100644
@@ -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;
 
drivers/mmc/host/sdhci-pxav3.c +1 -3
index a34434166ca7..b8e96f392428 100644
@@ -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);
drivers/mmc/host/sdhci-s3c.c +1 -3
index cda83ccb2702..9ef89d00970e 100644
@@ -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)
drivers/mmc/host/sdhci-spear.c +1 -3
index 14511526a3a8..9247d51f2eed 100644
@@ -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);
 
drivers/mmc/host/sdhci-st.c +1 -3
index c32daed0d418..8f95647195d9 100644
@@ -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));
 
Signature · 1 line
2.17.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Jisheng Zhang

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.

Quoted 1 line

From another side, if driver probing fails and the error number isn't

-EPROBE_DEFER, the core will tell us something as below:

Quoted 7 lines

[.....] 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.

Quoted 123 lines
---
 drivers/mmc/host/sdhci-bcm-kona.c | 4 +---
 drivers/mmc/host/sdhci-pic32.c    | 4 +---
 drivers/mmc/host/sdhci-pxav2.c    | 4 +---
 drivers/mmc/host/sdhci-pxav3.c    | 4 +---
 drivers/mmc/host/sdhci-s3c.c      | 4 +---
 drivers/mmc/host/sdhci-spear.c    | 4 +---
 drivers/mmc/host/sdhci-st.c       | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)
drivers/mmc/host/sdhci-bcm-kona.c +1 -3
index 11ca95c60bcf..bdbd4897c0f7 100644
@@ -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)) {
drivers/mmc/host/sdhci-pic32.c +1 -3
index a6caa49ca25a..a11e6397d4ff 100644
@@ -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;
drivers/mmc/host/sdhci-pxav2.c +1 -3
index 8986f9d9cf98..2c3827f54927 100644
@@ -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;
 
drivers/mmc/host/sdhci-pxav3.c +1 -3
index a34434166ca7..b8e96f392428 100644
@@ -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);
drivers/mmc/host/sdhci-s3c.c +1 -3
index cda83ccb2702..9ef89d00970e 100644
@@ -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)
drivers/mmc/host/sdhci-spear.c +1 -3
index 14511526a3a8..9247d51f2eed 100644
@@ -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);
 
drivers/mmc/host/sdhci-st.c +1 -3
index c32daed0d418..8f95647195d9 100644
@@ -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));
 
Acked-by on v1 1/1
#2 lore raw
In reply to Jisheng Zhang
Quoted 12 lines · Jisheng Zhang

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

Quoted 7 lines

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.

---
 drivers/mmc/host/sdhci-spear.c    | 4 +---
Signature · 1 line
viresh
Acked-by on v1 1/1
#3 lore raw
In reply to Jisheng Zhang

Hi Jisheng

Quoted 130 lines · Jisheng Zhang

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

(quoted diff) +0 -2
-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.

---
  drivers/mmc/host/sdhci-bcm-kona.c | 4 +---
  drivers/mmc/host/sdhci-pic32.c    | 4 +---
  drivers/mmc/host/sdhci-pxav2.c    | 4 +---
  drivers/mmc/host/sdhci-pxav3.c    | 4 +---
  drivers/mmc/host/sdhci-s3c.c      | 4 +---
  drivers/mmc/host/sdhci-spear.c    | 4 +---
  drivers/mmc/host/sdhci-st.c       | 4 +---
  7 files changed, 7 insertions(+), 21 deletions(-)
drivers/mmc/host/sdhci-bcm-kona.c +1 -3
index 11ca95c60bcf..bdbd4897c0f7 100644
@@ -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)) {
drivers/mmc/host/sdhci-pic32.c +1 -3
index a6caa49ca25a..a11e6397d4ff 100644
@@ -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;
drivers/mmc/host/sdhci-pxav2.c +1 -3
index 8986f9d9cf98..2c3827f54927 100644
@@ -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;
 
drivers/mmc/host/sdhci-pxav3.c +1 -3
index a34434166ca7..b8e96f392428 100644
@@ -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);
drivers/mmc/host/sdhci-s3c.c +1 -3
index cda83ccb2702..9ef89d00970e 100644
@@ -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)
drivers/mmc/host/sdhci-spear.c +1 -3
index 14511526a3a8..9247d51f2eed 100644
@@ -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);
 
drivers/mmc/host/sdhci-st.c +0 -0
index c32daed0d418..8f95647195d9 100644
@@ -422,10 +422,8 @@ static int sdhci_st_probe(struct platform_device *pdev)
  	st_mmcss_cconfig(np, host);

drivers/mmc/host/sdhci-st.c static int sdhci_st_probe(struct platform_device *pdev) · line 429

Quoted 10 lines
drivers/mmc/host/sdhci-st.c +1 -3
 
  	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));
 

For drivers/mmc/host/sdhci-st.c:

Thanks

Applied
#4 lore raw
In reply to Jisheng Zhang
Quoted 10 lines · Jisheng Zhang

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:

Quoted 7 lines

[.....] 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.

Thanks, applied for next!

Kind regards
Uffe

Quoted 125 lines
---
 drivers/mmc/host/sdhci-bcm-kona.c | 4 +---
 drivers/mmc/host/sdhci-pic32.c    | 4 +---
 drivers/mmc/host/sdhci-pxav2.c    | 4 +---
 drivers/mmc/host/sdhci-pxav3.c    | 4 +---
 drivers/mmc/host/sdhci-s3c.c      | 4 +---
 drivers/mmc/host/sdhci-spear.c    | 4 +---
 drivers/mmc/host/sdhci-st.c       | 4 +---
 7 files changed, 7 insertions(+), 21 deletions(-)
drivers/mmc/host/sdhci-bcm-kona.c +1 -3
index 11ca95c60bcf..bdbd4897c0f7 100644
@@ -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)) {
drivers/mmc/host/sdhci-pic32.c +1 -3
index a6caa49ca25a..a11e6397d4ff 100644
@@ -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;
drivers/mmc/host/sdhci-pxav2.c +1 -3
index 8986f9d9cf98..2c3827f54927 100644
@@ -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;
 
drivers/mmc/host/sdhci-pxav3.c +1 -3
index a34434166ca7..b8e96f392428 100644
@@ -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);
drivers/mmc/host/sdhci-s3c.c +1 -3
index cda83ccb2702..9ef89d00970e 100644
@@ -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)
drivers/mmc/host/sdhci-spear.c +1 -3
index 14511526a3a8..9247d51f2eed 100644
@@ -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);
 
drivers/mmc/host/sdhci-st.c +1 -4
index c32daed0d418..8f95647195d9 100644
@@ -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));
 
--

2.17.0