| From 51060f2d509fd12f3e817b017f0505f2cf2af689 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Fri, 6 Jan 2017 09:38:33 +0100 |
| Subject: [PATCH 152/255] mmc: host: tmio: drop superfluous exit path |
| |
| The probe exit path on error does nothing since commit 94b110aff8679b |
| ("mmc: tmio: add tmio_mmc_host_alloc/free()"), so we can bail out |
| immediately. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Reviewed-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit ad7014b3949b6c2b6ce46a546d6d204b5643e621) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 20 ++++++-------------- |
| 1 file changed, 6 insertions(+), 14 deletions(-) |
| |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -1143,7 +1143,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_ |
| |
| ret = mmc_of_parse(mmc); |
| if (ret < 0) |
| - goto host_free; |
| + return ret; |
| |
| _host->pdata = pdata; |
| platform_set_drvdata(pdev, mmc); |
| @@ -1153,14 +1153,12 @@ int tmio_mmc_host_probe(struct tmio_mmc_ |
| |
| ret = tmio_mmc_init_ocr(_host); |
| if (ret < 0) |
| - goto host_free; |
| + return ret; |
| |
| _host->ctl = devm_ioremap(&pdev->dev, |
| res_ctl->start, resource_size(res_ctl)); |
| - if (!_host->ctl) { |
| - ret = -ENOMEM; |
| - goto host_free; |
| - } |
| + if (!_host->ctl) |
| + return -ENOMEM; |
| |
| tmio_mmc_ops.card_busy = _host->card_busy; |
| tmio_mmc_ops.start_signal_voltage_switch = _host->start_signal_voltage_switch; |
| @@ -1198,10 +1196,8 @@ int tmio_mmc_host_probe(struct tmio_mmc_ |
| * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from |
| * looping forever... |
| */ |
| - if (mmc->f_min == 0) { |
| - ret = -EINVAL; |
| - goto host_free; |
| - } |
| + if (mmc->f_min == 0) |
| + return -EINVAL; |
| |
| /* |
| * While using internal tmio hardware logic for card detection, we need |
| @@ -1266,10 +1262,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_ |
| } |
| |
| return 0; |
| - |
| -host_free: |
| - |
| - return ret; |
| } |
| EXPORT_SYMBOL(tmio_mmc_host_probe); |
| |