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 21:11:11 +0800 |
| commit | a36274e0184193e393fb82957925c3981a6b0477 (patch) | |
| tree | e937d3932603f2c574e54a28b5cb1cf07029f9f1 /drivers/mmc/card/queue.c | |
| parent | 7a5ea56abc493fd43fb8d5b2f55d18396ec048f1 (diff) | |
| download | kernel_goldelico_gta04-a36274e0184193e393fb82957925c3981a6b0477.zip kernel_goldelico_gta04-a36274e0184193e393fb82957925c3981a6b0477.tar.gz kernel_goldelico_gta04-a36274e0184193e393fb82957925c3981a6b0477.tar.bz2 | |
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/card/queue.c')
| -rw-r--r-- | drivers/mmc/card/queue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 9c0b42b..7c3392e 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); |