diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2010-09-10 01:33:59 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2010-10-23 09:11:11 -0400 |
commit | a36274e0184193e393fb82957925c3981a6b0477 (patch) | |
tree | e937d3932603f2c574e54a28b5cb1cf07029f9f1 /drivers/mmc/host/davinci_mmc.c | |
parent | 7a5ea56abc493fd43fb8d5b2f55d18396ec048f1 (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/davinci_mmc.c')
-rw-r--r-- | drivers/mmc/host/davinci_mmc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 33d9f1b0086..e15547cf701 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c | |||
@@ -138,7 +138,7 @@ | |||
138 | /* | 138 | /* |
139 | * One scatterlist dma "segment" is at most MAX_CCNT rw_threshold units, | 139 | * One scatterlist dma "segment" is at most MAX_CCNT rw_threshold units, |
140 | * and we handle up to MAX_NR_SG segments. MMC_BLOCK_BOUNCE kicks in only | 140 | * and we handle up to MAX_NR_SG segments. MMC_BLOCK_BOUNCE kicks in only |
141 | * for drivers with max_hw_segs == 1, making the segments bigger (64KB) | 141 | * for drivers with max_segs == 1, making the segments bigger (64KB) |
142 | * than the page or two that's otherwise typical. nr_sg (passed from | 142 | * than the page or two that's otherwise typical. nr_sg (passed from |
143 | * platform data) == 16 gives at least the same throughput boost, using | 143 | * platform data) == 16 gives at least the same throughput boost, using |
144 | * EDMA transfer linkage instead of spending CPU time copying pages. | 144 | * EDMA transfer linkage instead of spending CPU time copying pages. |
@@ -1239,8 +1239,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) | |||
1239 | * Each hw_seg uses one EDMA parameter RAM slot, always one | 1239 | * Each hw_seg uses one EDMA parameter RAM slot, always one |
1240 | * channel and then usually some linked slots. | 1240 | * channel and then usually some linked slots. |
1241 | */ | 1241 | */ |
1242 | mmc->max_hw_segs = 1 + host->n_link; | 1242 | mmc->max_segs = 1 + host->n_link; |
1243 | mmc->max_phys_segs = mmc->max_hw_segs; | ||
1244 | 1243 | ||
1245 | /* EDMA limit per hw segment (one or two MBytes) */ | 1244 | /* EDMA limit per hw segment (one or two MBytes) */ |
1246 | mmc->max_seg_size = MAX_CCNT * rw_threshold; | 1245 | mmc->max_seg_size = MAX_CCNT * rw_threshold; |
@@ -1250,8 +1249,7 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev) | |||
1250 | mmc->max_blk_count = 65535; /* NBLK is 16 bits */ | 1249 | mmc->max_blk_count = 65535; /* NBLK is 16 bits */ |
1251 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; | 1250 | mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count; |
1252 | 1251 | ||
1253 | dev_dbg(mmc_dev(host->mmc), "max_phys_segs=%d\n", mmc->max_phys_segs); | 1252 | dev_dbg(mmc_dev(host->mmc), "max_segs=%d\n", mmc->max_segs); |
1254 | dev_dbg(mmc_dev(host->mmc), "max_hw_segs=%d\n", mmc->max_hw_segs); | ||
1255 | dev_dbg(mmc_dev(host->mmc), "max_blk_size=%d\n", mmc->max_blk_size); | 1253 | dev_dbg(mmc_dev(host->mmc), "max_blk_size=%d\n", mmc->max_blk_size); |
1256 | dev_dbg(mmc_dev(host->mmc), "max_req_size=%d\n", mmc->max_req_size); | 1254 | dev_dbg(mmc_dev(host->mmc), "max_req_size=%d\n", mmc->max_req_size); |
1257 | dev_dbg(mmc_dev(host->mmc), "max_seg_size=%d\n", mmc->max_seg_size); | 1255 | dev_dbg(mmc_dev(host->mmc), "max_seg_size=%d\n", mmc->max_seg_size); |