mmc: Remove distinction between hw and phys segments

We have deprecated the distinction between hardware and physical
segments in the block layer.  Consolidate the two limits into one in
drivers/mmc/.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

24 files changed, 31 insertions, 52 deletions

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 9c0b42bfe089..7c3392e50722 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -146,7 +146,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
         }
 
 #ifdef CONFIG_MMC_BLOCK_BOUNCE
-        if (host->max_hw_segs == 1) {
+        if (host->max_segs == 1) {
                 unsigned int bouncesz;
 
                 bouncesz = MMC_QUEUE_BOUNCESZ;
@@ -196,16 +196,16 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
                 blk_queue_bounce_limit(mq->queue, limit);
                 blk_queue_max_hw_sectors(mq->queue,
                         min(host->max_blk_count, host->max_req_size / 512));
-                blk_queue_max_segments(mq->queue, host->max_hw_segs);
+                blk_queue_max_segments(mq->queue, host->max_segs);
                 blk_queue_max_segment_size(mq->queue, host->max_seg_size);
 
                 mq->sg = kmalloc(sizeof(struct scatterlist) *
-                        host->max_phys_segs, GFP_KERNEL);
+                        host->max_segs, GFP_KERNEL);
                 if (!mq->sg) {
                         ret = -ENOMEM;
                         goto cleanup_queue;
                 }
-                sg_init_table(mq->sg, host->max_phys_segs);
+                sg_init_table(mq->sg, host->max_segs);
         }
 
         init_MUTEX(&mq->thread_sem);
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index d80cfdc8edd2..10b8af27e03a 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -94,8 +94,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
          * By default, hosts do not support SGIO or large requests.
          * They have to set these according to their abilities.
          */
-        host->max_hw_segs = 1;
-        host->max_phys_segs = 1;
+        host->max_segs = 1;
         host->max_seg_size = PAGE_CACHE_SIZE;
 
         host->max_req_size = PAGE_CACHE_SIZE;
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 339e5913e5cc..591ab540b407 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -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);
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 1d4e5464ea2f..301351a5d838 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1618,8 +1618,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
         if (slot_data->bus_width >= 4)
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
 
-        mmc->max_hw_segs = 64;
-        mmc->max_phys_segs = 64;
+        mmc->max_segs = 64;
         mmc->max_req_size = 32768 * 512;
         mmc->max_blk_size = 32768;
         mmc->max_blk_count = 512;
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index e14b866b270f..41e5a60493ad 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -998,7 +998,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
         mmc->f_max = 24000000;
 
         mmc->max_seg_size = AU1XMMC_DESCRIPTOR_SIZE;
-        mmc->max_phys_segs = AU1XMMC_DESCRIPTOR_COUNT;
+        mmc->max_segs = AU1XMMC_DESCRIPTOR_COUNT;
 
         mmc->max_blk_size = 2048;
         mmc->max_blk_count = 512;
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 4b0e677d7295..bac7d62866b7 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -469,7 +469,7 @@ static int __devinit sdh_probe(struct platform_device *pdev)
         }
 
         mmc->ops = &sdh_ops;
-        mmc->max_phys_segs = 32;
+        mmc->max_segs = 32;
         mmc->max_seg_size = 1 << 16;
         mmc->max_blk_size = 1 << 11;
         mmc->max_blk_count = 1 << 11;
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 33d9f1b00862..e15547cf701f 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -138,7 +138,7 @@
 /*
  * One scatterlist dma "segment" is at most MAX_CCNT rw_threshold units,
  * and we handle up to MAX_NR_SG segments.  MMC_BLOCK_BOUNCE kicks in only
- * for drivers with max_hw_segs == 1, making the segments bigger (64KB)
+ * for drivers with max_segs == 1, making the segments bigger (64KB)
  * than the page or two that's otherwise typical. nr_sg (passed from
  * platform data) == 16 gives at least the same throughput boost, using
  * EDMA transfer linkage instead of spending CPU time copying pages.
@@ -1239,8 +1239,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
          * Each hw_seg uses one EDMA parameter RAM slot, always one
          * channel and then usually some linked slots.
          */
-        mmc->max_hw_segs        = 1 + host->n_link;
-        mmc->max_phys_segs      = mmc->max_hw_segs;
+        mmc->max_segs           = 1 + host->n_link;
 
         /* EDMA limit per hw segment (one or two MBytes) */
         mmc->max_seg_size       = MAX_CCNT * rw_threshold;
@@ -1250,8 +1249,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
         mmc->max_blk_count      = 65535; /* NBLK is 16 bits */
         mmc->max_req_size       = mmc->max_blk_size * mmc->max_blk_count;
 
-        dev_dbg(mmc_dev(host->mmc), "max_phys_segs=%d\n", mmc->max_phys_segs);
-        dev_dbg(mmc_dev(host->mmc), "max_hw_segs=%d\n", mmc->max_hw_segs);
+        dev_dbg(mmc_dev(host->mmc), "max_segs=%d\n", mmc->max_segs);
         dev_dbg(mmc_dev(host->mmc), "max_blk_size=%d\n", mmc->max_blk_size);
         dev_dbg(mmc_dev(host->mmc), "max_req_size=%d\n", mmc->max_req_size);
         dev_dbg(mmc_dev(host->mmc), "max_seg_size=%d\n", mmc->max_seg_size);
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 5a950b16d9e6..881f7ba545ae 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -966,8 +966,7 @@ static int __init imxmci_probe(struct platform_device *pdev)
         mmc->caps = MMC_CAP_4_BIT_DATA;
 
         /* MMC core transfer sizes tunable parameters */
-        mmc->max_hw_segs = 64;
-        mmc->max_phys_segs = 64;
+        mmc->max_segs = 64;
         mmc->max_seg_size = 64*512;     /* default PAGE_CACHE_SIZE */
         mmc->max_req_size = 64*512;     /* default PAGE_CACHE_SIZE */
         mmc->max_blk_size = 2048;
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index ad4f9870e3ca..b3a0ab0e4c2b 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -876,8 +876,7 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
         mmc->max_blk_count = (1 << 15) - 1;
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
 
-        mmc->max_phys_segs = 128;
-        mmc->max_hw_segs = 128;
+        mmc->max_segs = 128;
         mmc->max_seg_size = mmc->max_req_size;
 
         host->mmc = mmc;
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 62a35822003e..5b0b50636ec4 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1345,8 +1345,7 @@ static int mmc_spi_probe(struct spi_device *spi)
 
         mmc->ops = &mmc_spi_ops;
         mmc->max_blk_size = MMC_SPI_BLOCKSIZE;
-        mmc->max_hw_segs = MMC_SPI_BLOCKSATONCE;
-        mmc->max_phys_segs = MMC_SPI_BLOCKSATONCE;
+        mmc->max_segs = MMC_SPI_BLOCKSATONCE;
         mmc->max_req_size = MMC_SPI_BLOCKSATONCE * MMC_SPI_BLOCKSIZE;
         mmc->max_blk_count = MMC_SPI_BLOCKSATONCE;
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f2e02d7d9f3d..5f2e72d38b5d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -734,8 +734,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
         /*
          * We can do SGIO
          */
-        mmc->max_hw_segs = 16;
-        mmc->max_phys_segs = NR_SG;
+        mmc->max_segs = NR_SG;
 
         /*
          * Since only a certain number of bits are valid in the data length
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index ff7752348b11..1290d14c5839 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1164,8 +1164,7 @@ msmsdcc_probe(struct platform_device *pdev)
                 mmc->caps |= MMC_CAP_SDIO_IRQ;
         mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
 
-        mmc->max_phys_segs = NR_SG;
-        mmc->max_hw_segs = NR_SG;
+        mmc->max_segs = NR_SG;
         mmc->max_blk_size = 4096;       /* MCI_DATA_CTL BLOCKSIZE up to 4096 */
         mmc->max_blk_count = 65536;
 
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 366eefa77c5a..a5bf60e01af4 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -742,8 +742,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
         mmc->max_blk_size = 2048;
         mmc->max_blk_count = 65535;
 
-        mmc->max_hw_segs = 1;
-        mmc->max_phys_segs = 1;
+        mmc->max_segs = 1;
         mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count;
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
 
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index 350f78e86245..bdd2cbb87cba 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -790,8 +790,7 @@ static int mxcmci_probe(struct platform_device *pdev)
         mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
 
         /* MMC core transfer sizes tunable parameters */
-        mmc->max_hw_segs = 64;
-        mmc->max_phys_segs = 64;
+        mmc->max_segs = 64;
         mmc->max_blk_size = 2048;
         mmc->max_blk_count = 65535;
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index d98ddcfac5e5..0c7e37f496ef 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1335,8 +1335,7 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id)
          * NOTE max_seg_size assumption that small blocks aren't
          * normally used (except e.g. for reading SD registers).
          */
-        mmc->max_phys_segs = 32;
-        mmc->max_hw_segs = 32;
+        mmc->max_segs = 32;
         mmc->max_blk_size = 2048;       /* BLEN is 11 bits (+1) */
         mmc->max_blk_count = 2048;      /* NBLK is 11 bits (+1) */
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 4526d2791f29..03c26e026506 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2105,8 +2105,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 
         /* Since we do only SG emulation, we can have as many segs
          * as we want. */
-        mmc->max_phys_segs = 1024;
-        mmc->max_hw_segs = 1024;
+        mmc->max_segs = 1024;
 
         mmc->max_blk_size = 512;       /* Block Length at max can be 1024 */
         mmc->max_blk_count = 0xFFFF;    /* No. of Blocks is 16 bits */
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 0a4e43f37140..b7dfcac31e8a 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -576,7 +576,7 @@ static int pxamci_probe(struct platform_device *pdev)
          * We can do SG-DMA, but we don't because we never know how much
          * data we successfully wrote to the card.
          */
-        mmc->max_phys_segs = NR_SG;
+        mmc->max_segs = NR_SG;
 
         /*
          * Our hardware DMA can handle a maximum of one page per SG entry.
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 976330de379e..1ccd4b256cee 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1736,8 +1736,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
         mmc->max_req_size       = 4095 * 512;
         mmc->max_seg_size       = mmc->max_req_size;
 
-        mmc->max_phys_segs      = 128;
-        mmc->max_hw_segs        = 128;
+        mmc->max_segs           = 128;
 
         dbg(host, dbg_debug,
             "probe: mode:%s mapped mci_base:%p irq:%u irq_cd:%u dma:%u.\n",
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 401527d273b5..f608626c4821 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1850,12 +1850,11 @@ int sdhci_add_host(struct sdhci_host *host)
          * can do scatter/gather or not.
          */
         if (host->flags & SDHCI_USE_ADMA)
-                mmc->max_hw_segs = 128;
+                mmc->max_segs = 128;
         else if (host->flags & SDHCI_USE_SDMA)
-                mmc->max_hw_segs = 1;
+                mmc->max_segs = 1;
         else /* PIO */
-                mmc->max_hw_segs = 128;
-        mmc->max_phys_segs = 128;
+                mmc->max_segs = 128;
 
         /*
          * Maximum number of sectors in one transfer. Limited by DMA boundary
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 5d3f824bb5a3..0f06b8002814 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -846,8 +846,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
         mmc->caps = MMC_CAP_MMC_HIGHSPEED;
         if (pd->caps)
                 mmc->caps |= pd->caps;
-        mmc->max_phys_segs = 128;
-        mmc->max_hw_segs = 128;
+        mmc->max_segs = 128;
         mmc->max_blk_size = 512;
         mmc->max_blk_count = 65535;
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index cec99958b652..457c26ea09de 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -978,11 +978,10 @@ static int tifm_sd_probe(struct tifm_dev *sock)
         mmc->f_max = 24000000;
 
         mmc->max_blk_count = 2048;
-        mmc->max_hw_segs = mmc->max_blk_count;
+        mmc->max_segs = mmc->max_blk_count;
         mmc->max_blk_size = min(TIFM_MMCSD_MAX_BLOCK_SIZE, PAGE_SIZE);
         mmc->max_seg_size = mmc->max_blk_count * mmc->max_blk_size;
         mmc->max_req_size = mmc->max_seg_size;
-        mmc->max_phys_segs = mmc->max_hw_segs;
 
         sock->card_event = tifm_sd_card_event;
         sock->data_event = tifm_sd_data_event;
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index 19f2d72dbca5..9ed84ddb4780 100644
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -1050,8 +1050,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)
         mmc->ops = &via_sdc_ops;
 
         /*Hardware cannot do scatter lists*/
-        mmc->max_hw_segs = 1;
-        mmc->max_phys_segs = 1;
+        mmc->max_segs = 1;
 
         mmc->max_blk_size = VIA_CRDR_MAX_BLOCK_LENGTH;
         mmc->max_blk_count = VIA_CRDR_MAX_BLOCK_COUNT;
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index 0012f5d13d28..7fca0a386ba0 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1235,8 +1235,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev)
          * Maximum number of segments. Worst case is one sector per segment
          * so this will be 64kB/512.
          */
-        mmc->max_hw_segs = 128;
-        mmc->max_phys_segs = 128;
+        mmc->max_segs = 128;
 
         /*
          * Maximum request size. Also limited by 64KiB buffer.
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 1575b52c3bfa..ded401703762 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -162,8 +162,7 @@ struct mmc_host {
 
         /* host specific block data */
         unsigned int            max_seg_size;   /* see blk_queue_max_segment_size */
-        unsigned short          max_hw_segs;    /* see blk_queue_max_hw_segments */
-        unsigned short          max_phys_segs;  /* see blk_queue_max_phys_segments */
+        unsigned short          max_segs;       /* see blk_queue_max_segments */
         unsigned short          unused;
         unsigned int            max_req_size;   /* maximum number of bytes in one req */
         unsigned int            max_blk_size;   /* maximum size of one mmc block */