blob: bd44c2967328bbb6e0ac6f10b14a441f6c59d521 [file] [log] [blame]
From 63aae89b0c34a32139dc4428fba416839196b34b Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sat, 25 Nov 2017 01:24:38 +0900
Subject: [PATCH 0453/1795] mmc: renesas_sdhi: remove eprobe jump label
"goto eprobe" does nothing. Return directly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 4ce6281791676c134d3ae919edaf76da3cef1d76)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/mmc/host/renesas_sdhi_core.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 157e1d9e7725..2daca2b1066f 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -498,7 +498,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
if (IS_ERR(priv->clk)) {
ret = PTR_ERR(priv->clk);
dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
- goto eprobe;
+ return ret;
}
/*
@@ -525,10 +525,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;
@@ -653,7 +651,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);
--
2.19.0