Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
  mmc: add new sdhci-pxa driver for Marvell SoCs
  mmc: make number of mmcblk minors configurable
  mmc_spi: Recover from CRC errors for r/w operation over SPI.
  mmc: sdhci-pltfm: add -pltfm driver for imx35/51
  mmc: sdhci-of-esdhc: factor out common stuff
  mmc: sdhci_pltfm: pass more data on custom init call
  mmc: sdhci: introduce get_ro private write-protect hook
  mmc: sdhci-pltfm: move .h file into appropriate subdir
  mmc: sdhci-pltfm: Add structure for host-specific data
  mmc: fix cb710 kconfig dependency warning
  mmc: cb710: remove debugging printk (info duplicated from mmc-core)
  mmc: cb710: clear irq handler on init() error path
  mmc: cb710: remove unnecessary msleep()
  mmc: cb710: implement get_cd() callback
  mmc: cb710: partially demystify clock selection
  mmc: add a file to debugfs for changing host clock at runtime
  mmc: sdhci: allow for eMMC 74 clock generation by controller
  mmc: sdhci: highspeed: check for mmc as well as sd cards
  mmc: sdhci: Add Moorestown device support
  mmc: sdhci: Intel Medfield support
  ...

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 87226cd202a5..591ab540b407 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -928,7 +928,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
         if (!res)
                 return -ENXIO;
 
-        if (!request_mem_region(res->start, res->end - res->start + 1, DRIVER_NAME))
+        if (!request_mem_region(res->start, resource_size(res), DRIVER_NAME))
                 return -EBUSY;
 
         mmc = mmc_alloc_host(sizeof(struct at91mci_host), &pdev->dev);
@@ -947,8 +947,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
         mmc->max_blk_size  = MCI_MAXBLKSIZE;
         mmc->max_blk_count = MCI_BLKATONCE;
         mmc->max_req_size  = MCI_BUFSIZE;
-        mmc->max_phys_segs = MCI_BLKATONCE;
-        mmc->max_hw_segs   = MCI_BLKATONCE;
+        mmc->max_segs      = MCI_BLKATONCE;
         mmc->max_seg_size  = MCI_BUFSIZE;
 
         host = mmc_priv(mmc);
@@ -1017,7 +1016,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
         /*
          * Map I/O region
          */
-        host->baseaddr = ioremap(res->start, res->end - res->start + 1);
+        host->baseaddr = ioremap(res->start, resource_size(res));
         if (!host->baseaddr) {
                 ret = -ENOMEM;
                 goto fail1;
@@ -1093,7 +1092,7 @@ fail4b:
 fail5:
         mmc_free_host(mmc);
 fail6:
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
         dev_err(&pdev->dev, "probe failed, err %d\n", ret);
         return ret;
 }
@@ -1138,7 +1137,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
 
         iounmap(host->baseaddr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
 
         mmc_free_host(mmc);
         platform_set_drvdata(pdev, NULL);