Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2...

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / tmio_mmc_pio.c

diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index dba7e1c19dd758e784f31c89afe7dafc66334a06..e3dcf31a8bd6a04e8abd174c964313db584fe1a1 100644 (file)
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1108,7 +1108,8 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
        if (ret < 0)
                goto host_free;
 
-       _host->ctl = ioremap(res_ctl->start, resource_size(res_ctl));
+       _host->ctl = devm_ioremap(&pdev->dev,
+                                 res_ctl->start, resource_size(res_ctl));
        if (!_host->ctl) {
                ret = -ENOMEM;
                goto host_free;
@@ -1230,8 +1231,6 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
 
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
-
-       iounmap(host->ctl);
 }
 EXPORT_SYMBOL(tmio_mmc_host_remove);