Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / mmc / host / mxs-mmc.c

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 206fe499ded5b565a21f473291652930aa81a356..4efe3021b21766cf0c247cb1b8217e6d2c68267a 100644 (file)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -354,7 +354,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
        struct dma_async_tx_descriptor *desc;
        struct scatterlist *sgl = data->sg, *sg;
        unsigned int sg_len = data->sg_len;
-       int i;
+       unsigned int i;
 
        unsigned short dma_data_dir, timeout;
        enum dma_transfer_direction slave_dirn;
@@ -614,9 +614,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
        host = mmc_priv(mmc);
        ssp = &host->ssp;
        ssp->dev = &pdev->dev;
-       ssp->base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!ssp->base) {
-               ret = -EADDRNOTAVAIL;
+       ssp->base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(ssp->base)) {
+               ret = PTR_ERR(ssp->base);
                goto out_mmc_free;
        }
 
@@ -804,3 +804,4 @@ module_platform_driver(mxs_mmc_driver);
 MODULE_DESCRIPTION("FREESCALE MXS MMC peripheral");
 MODULE_AUTHOR("Freescale Semiconductor");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRIVER_NAME);