|
@@ -1143,7 +1143,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
|
|
|
|
|
|
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_host *_host,
|
|
|
|
|
|
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_host *_host,
|
|
|
* 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_host *_host,
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-host_free:
|
|
|
-
|
|
|
- return ret;
|
|
|
}
|
|
|
EXPORT_SYMBOL(tmio_mmc_host_probe);
|
|
|
|