aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2010-09-10 01:33:59 -0400
committerChris Ball <cjb@laptop.org>2010-10-23 09:11:11 -0400
commita36274e0184193e393fb82957925c3981a6b0477 (patch)
treee937d3932603f2c574e54a28b5cb1cf07029f9f1 /drivers/mmc/host/sdhci.c
parent7a5ea56abc493fd43fb8d5b2f55d18396ec048f1 (diff)
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>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c7
1 files changed, 3 insertions, 4 deletions
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)
1850 * can do scatter/gather or not. 1850 * can do scatter/gather or not.
1851 */ 1851 */
1852 if (host->flags & SDHCI_USE_ADMA) 1852 if (host->flags & SDHCI_USE_ADMA)
1853 mmc->max_hw_segs = 128; 1853 mmc->max_segs = 128;
1854 else if (host->flags & SDHCI_USE_SDMA) 1854 else if (host->flags & SDHCI_USE_SDMA)
1855 mmc->max_hw_segs = 1; 1855 mmc->max_segs = 1;
1856 else /* PIO */ 1856 else /* PIO */
1857 mmc->max_hw_segs = 128; 1857 mmc->max_segs = 128;
1858 mmc->max_phys_segs = 128;
1859 1858
1860 /* 1859 /*
1861 * Maximum number of sectors in one transfer. Limited by DMA boundary 1860 * Maximum number of sectors in one transfer. Limited by DMA boundary