diff mbox

[1/6] mmc: renesas_sdhc: remove eprobe jump label

Message ID 1510042172-27220-2-git-send-email-yamada.masahiro@socionext.com (mailing list archive)
State New, archived
Headers show

Commit Message

Masahiro Yamada Nov. 7, 2017, 8:09 a.m. UTC 
"goto eprobe" does nothing useful.  Return directly.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/mmc/host/renesas_sdhi_core.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Comments

Wolfram Sang Nov. 20, 2017, 8:31 p.m. UTC | #1 
> -		ret = PTR_ERR(priv->clk);
> -		dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
> -		goto eprobe;
> +		dev_err(&pdev->dev, "cannot get clock\n");
> +		return PTR_ERR(priv->clk);

Why dropping the 'ret' printout? Will it be printed by the core?
Masahiro Yamada Nov. 21, 2017, 3:03 a.m. UTC | #2 
2017-11-21 5:31 GMT+09:00 Wolfram Sang <wsa@the-dreams.de>:
>
>> -             ret = PTR_ERR(priv->clk);
>> -             dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
>> -             goto eprobe;
>> +             dev_err(&pdev->dev, "cannot get clock\n");
>> +             return PTR_ERR(priv->clk);
>
> Why dropping the 'ret' printout? Will it be printed by the core?
>

No.
I just wanted to save "ret = PTR_ERR(priv->clk)" line.


I will restore the printout as follows:

priv->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(priv->clk)) {
        ret = PTR_ERR(priv->clk);
        dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
        return ret;
}
diff mbox

Patch

diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index fcf7235..4b7a4e2 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -495,9 +495,8 @@  int renesas_sdhi_probe(struct platform_device *pdev,
 
 	priv->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(priv->clk)) {
-		ret = PTR_ERR(priv->clk);
-		dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
-		goto eprobe;
+		dev_err(&pdev->dev, "cannot get clock\n");
+		return PTR_ERR(priv->clk);
 	}
 
 	/*
@@ -524,10 +523,8 @@  int renesas_sdhi_probe(struct platform_device *pdev,
 	}
 
 	host = tmio_mmc_host_alloc(pdev);
-	if (!host) {
-		ret = -ENOMEM;
-		goto eprobe;
-	}
+	if (!host)
+		return -ENOMEM;
 
 	if (of_data) {
 		mmc_data->flags |= of_data->tmio_flags;
@@ -652,7 +649,7 @@  int renesas_sdhi_probe(struct platform_device *pdev,
 	tmio_mmc_host_remove(host);
 efree:
 	tmio_mmc_host_free(host);
-eprobe:
+
 	return ret;
 }
 EXPORT_SYMBOL_GPL(renesas_sdhi_probe);