OSDN Git Service

mmc: tmio: use devm_ioremap_resource() instead of devm_ioremap()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 24 Nov 2017 16:24:40 +0000 (01:24 +0900)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 18 Dec 2017 12:56:57 +0000 (13:56 +0100)
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>
drivers/mmc/host/tmio_mmc_core.c

index 8787a99..151a542 100644 (file)
@@ -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;