--- drivers/mmc/card/queue.c | 5 ++--- drivers/mmc/core/host.c | 1 - drivers/mmc/host/atmel-mci.c | 1 - drivers/mmc/host/imxmmc.c | 1 - drivers/mmc/host/mmci.c | 1 - drivers/mmc/host/omap.c | 1 - drivers/mmc/host/s3cmci.c | 1 - drivers/mmc/host/sdhci.c | 7 +++---- drivers/mmc/host/tifm_sd.c | 3 +-- drivers/mmc/host/wbsd.c | 1 - include/linux/mmc/host.h | 1 - 11 files changed, 6 insertions(+), 17 deletions(-) Index: linux-2.6.27-rc9-devel/drivers/mmc/card/queue.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/card/queue.c 2008-10-09 00:55:39.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/card/queue.c 2008-10-09 00:55:40.000000000 +0200 @@ -133,7 +133,7 @@ int mmc_init_queue(struct mmc_queue *mq, blk_queue_prep_rq(mq->queue, mmc_prep_request); #ifdef CONFIG_MMC_BLOCK_BOUNCE - if (host->max_hw_segs == 1) { + if (host->max_phys_segs == 1) { unsigned int bouncesz; bouncesz = MMC_QUEUE_BOUNCESZ; @@ -175,8 +175,7 @@ int mmc_init_queue(struct mmc_queue *mq, if (!mq->bounce_buf) { blk_queue_bounce_limit(mq->queue, limit); blk_queue_max_sectors(mq->queue, host->max_req_size / 512); - /* TODO: drop host->max_hw_segs */ - blk_queue_max_phys_segments(mq->queue, min(host->max_phys_segs, host->max_hw_segs)); + blk_queue_max_phys_segments(mq->queue, host->max_phys_segs); blk_queue_max_segment_size(mq->queue, host->max_seg_size); mq->sg = kmalloc(sizeof(struct scatterlist) * Index: linux-2.6.27-rc9-devel/drivers/mmc/core/host.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/core/host.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/core/host.c 2008-10-09 00:55:40.000000000 +0200 @@ -89,7 +89,6 @@ struct mmc_host *mmc_alloc_host(int extr * 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_seg_size = PAGE_CACHE_SIZE; Index: linux-2.6.27-rc9-devel/drivers/mmc/host/atmel-mci.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/atmel-mci.c 2008-10-09 00:35:05.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/atmel-mci.c 2008-10-09 00:55:40.000000000 +0200 @@ -1039,7 +1039,6 @@ static int __init atmci_probe(struct pla mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; mmc->caps |= MMC_CAP_4_BIT_DATA; - mmc->max_hw_segs = 64; mmc->max_phys_segs = 64; mmc->max_req_size = 32768 * 512; mmc->max_blk_size = 32768; Index: linux-2.6.27-rc9-devel/drivers/mmc/host/imxmmc.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/imxmmc.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/imxmmc.c 2008-10-09 00:55:40.000000000 +0200 @@ -958,7 +958,6 @@ static int imxmci_probe(struct platform_ 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_seg_size = 64*512; /* default PAGE_CACHE_SIZE */ mmc->max_req_size = 64*512; /* default PAGE_CACHE_SIZE */ Index: linux-2.6.27-rc9-devel/drivers/mmc/host/mmci.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/mmci.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/mmci.c 2008-10-09 00:55:40.000000000 +0200 @@ -539,7 +539,6 @@ static int mmci_probe(struct amba_device /* * We can do SGIO */ - mmc->max_hw_segs = 16; mmc->max_phys_segs = NR_SG; /* Index: linux-2.6.27-rc9-devel/drivers/mmc/host/omap.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/omap.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/omap.c 2008-10-09 00:55:40.000000000 +0200 @@ -1336,7 +1336,6 @@ static int __init mmc_omap_new_slot(stru * normally used (except e.g. for reading SD registers). */ mmc->max_phys_segs = 32; - mmc->max_hw_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; Index: linux-2.6.27-rc9-devel/drivers/mmc/host/s3cmci.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/s3cmci.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/s3cmci.c 2008-10-09 00:55:40.000000000 +0200 @@ -1291,7 +1291,6 @@ static int __devinit s3cmci_probe(struct mmc->max_seg_size = mmc->max_req_size; mmc->max_phys_segs = 128; - mmc->max_hw_segs = 128; dbg(host, dbg_debug, "probe: mode:%s mapped mci_base:%p irq:%u irq_cd:%u dma:%u.\n", Index: linux-2.6.27-rc9-devel/drivers/mmc/host/sdhci.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/sdhci.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/sdhci.c 2008-10-09 00:55:40.000000000 +0200 @@ -1628,12 +1628,11 @@ int sdhci_add_host(struct sdhci_host *ho * can do scatter/gather or not. */ if (host->flags & SDHCI_USE_ADMA) - mmc->max_hw_segs = 128; + mmc->max_phys_segs = 128; else if (host->flags & SDHCI_USE_DMA) - mmc->max_hw_segs = 1; + mmc->max_phys_segs = 1; else /* PIO */ - mmc->max_hw_segs = 128; - mmc->max_phys_segs = 128; + mmc->max_phys_segs = 128; /* * Maximum number of sectors in one transfer. Limited by DMA boundary Index: linux-2.6.27-rc9-devel/drivers/mmc/host/tifm_sd.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/tifm_sd.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/tifm_sd.c 2008-10-09 00:55:40.000000000 +0200 @@ -978,11 +978,10 @@ static int tifm_sd_probe(struct tifm_dev mmc->f_max = 24000000; mmc->max_blk_count = 2048; - mmc->max_hw_segs = mmc->max_blk_count; + mmc->max_phys_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; Index: linux-2.6.27-rc9-devel/drivers/mmc/host/wbsd.c =================================================================== --- linux-2.6.27-rc9-devel.orig/drivers/mmc/host/wbsd.c 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/drivers/mmc/host/wbsd.c 2008-10-09 00:55:40.000000000 +0200 @@ -1234,7 +1234,6 @@ static int __devinit wbsd_alloc_mmc(stru * 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; /* Index: linux-2.6.27-rc9-devel/include/linux/mmc/host.h =================================================================== --- linux-2.6.27-rc9-devel.orig/include/linux/mmc/host.h 2008-10-09 00:34:18.000000000 +0200 +++ linux-2.6.27-rc9-devel/include/linux/mmc/host.h 2008-10-09 00:55:40.000000000 +0200 @@ -119,7 +119,6 @@ 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 unused; unsigned int max_req_size; /* maximum number of bytes in one req */