| From c8e129b03794916337b98962613dc6c9cfb7c784 Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Date: Sat, 25 Nov 2017 01:24:40 +0900 |
| Subject: [PATCH 0455/1795] mmc: tmio: use devm_ioremap_resource() instead of |
| devm_ioremap() |
| |
| The TMIO core misses to call request_mem_region(). |
| devm_ioremap_resource() takes care of it and makes the code cleaner. |
| |
| Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 4139696b7978d57ec840b6c9293d4709a46af3bd) |
| 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 | 10 +++------- |
| 1 file changed, 3 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c |
| index 58947a73c65f..f6f47e1ce6dd 100644 |
| --- a/drivers/mmc/host/tmio_mmc_core.c |
| +++ b/drivers/mmc/host/tmio_mmc_core.c |
| @@ -1185,8 +1185,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| _host->write16_hook = NULL; |
| |
| res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| - if (!res_ctl) |
| - return -EINVAL; |
| + _host->ctl = devm_ioremap_resource(&pdev->dev, res_ctl); |
| + if (IS_ERR(_host->ctl)) |
| + return PTR_ERR(_host->ctl); |
| |
| ret = mmc_of_parse(mmc); |
| if (ret < 0) |
| @@ -1202,11 +1203,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, |
| if (ret < 0) |
| return ret; |
| |
| - _host->ctl = devm_ioremap(&pdev->dev, |
| - res_ctl->start, resource_size(res_ctl)); |
| - 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; |
| -- |
| 2.19.0 |
| |
