| From 25eaa9309036453b683e612694309cab701a3fbb Mon Sep 17 00:00:00 2001 |
| From: Markus Elfring <elfring@users.sourceforge.net> |
| Date: Fri, 27 Oct 2017 19:09:17 +0200 |
| Subject: [PATCH 0157/1795] mmc: tmio: Use common error handling code in |
| tmio_mmc_host_probe() |
| |
| * Add a jump target so that a bit of exception handling can be better |
| reused at the end of this function. |
| |
| * Adjust condition checks. |
| |
| This issue was detected by using the Coccinelle software. |
| |
| Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 7f8e446b032bd6bbcec7c2f068d0a4f2d5929249) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/mmc/host/tmio_mmc_core.c | 17 +++++++++-------- |
| 1 file changed, 9 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index de1562f27fdb..788f11c0ea38 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -1302,23 +1302,24 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| pm_runtime_enable(&pdev->dev); |
| |
| ret = mmc_add_host(mmc); |
| - if (ret < 0) { |
| - tmio_mmc_host_remove(_host); |
| - return ret; |
| - } |
| + if (ret) |
| + goto remove_host; |
| |
| dev_pm_qos_expose_latency_limit(&pdev->dev, 100); |
| |
| if (pdata->flags & TMIO_MMC_USE_GPIO_CD) { |
| ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0); |
| - if (ret < 0) { |
| - tmio_mmc_host_remove(_host); |
| - return ret; |
| - } |
| + if (ret) |
| + goto remove_host; |
| + |
| mmc_gpiod_request_cd_irq(mmc); |
| } |
| |
| return 0; |
| + |
| +remove_host: |
| + tmio_mmc_host_remove(_host); |
| + return ret; |
| } |
| EXPORT_SYMBOL_GPL(tmio_mmc_host_probe); |
| |
| -- |
| 2.19.0 |
| |