diff options
| author | Jaehoon Chung | 2015-08-06 09:23:25 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2015-08-17 12:45:27 +0200 |
| commit | 2b708df2b3edf6e91a4c8d89e7aedb0f861d0e41 (patch) | |
| tree | bef5edb68e972ebf274e213ff0b219f5c727e0c6 | |
| parent | mmc: dw_mmc: fix the wrong condition checking (diff) | |
| download | kernel-qcow2-linux-2b708df2b3edf6e91a4c8d89e7aedb0f861d0e41.tar.gz kernel-qcow2-linux-2b708df2b3edf6e91a4c8d89e7aedb0f861d0e41.tar.xz kernel-qcow2-linux-2b708df2b3edf6e91a4c8d89e7aedb0f861d0e41.zip | |
mmc: dw_mmc: remove the unused blk_setting
"blk_setting" doesn't use anywhere.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 34 | ||||
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 1 |
2 files changed, 13 insertions, 22 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index de88e640097e..091df65f7813 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2436,28 +2436,20 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (ret) goto err_host_allocated; - if (host->pdata->blk_settings) { - mmc->max_segs = host->pdata->blk_settings->max_segs; - mmc->max_blk_size = host->pdata->blk_settings->max_blk_size; - mmc->max_blk_count = host->pdata->blk_settings->max_blk_count; - mmc->max_req_size = host->pdata->blk_settings->max_req_size; - mmc->max_seg_size = host->pdata->blk_settings->max_seg_size; + /* Useful defaults if platform data is unset. */ + if (host->use_dma) { + mmc->max_segs = host->ring_size; + mmc->max_blk_size = 65536; + mmc->max_seg_size = 0x1000; + mmc->max_req_size = mmc->max_seg_size * host->ring_size; + mmc->max_blk_count = mmc->max_req_size / 512; } else { - /* Useful defaults if platform data is unset. */ - if (host->use_dma) { - mmc->max_segs = host->ring_size; - mmc->max_blk_size = 65536; - mmc->max_seg_size = 0x1000; - mmc->max_req_size = mmc->max_seg_size * host->ring_size; - mmc->max_blk_count = mmc->max_req_size / 512; - } else { - mmc->max_segs = 64; - mmc->max_blk_size = 65536; /* BLKSIZ is 16 bits */ - mmc->max_blk_count = 512; - mmc->max_req_size = mmc->max_blk_size * - mmc->max_blk_count; - mmc->max_seg_size = mmc->max_req_size; - } + mmc->max_segs = 64; + mmc->max_blk_size = 65536; /* BLKSIZ is 16 bits */ + mmc->max_blk_count = 512; + mmc->max_req_size = mmc->max_blk_size * + mmc->max_blk_count; + mmc->max_seg_size = mmc->max_req_size; } if (dw_mci_get_cd(mmc)) diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 1d88bf72c65f..b14fcb5012f1 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -255,7 +255,6 @@ struct dw_mci_board { struct dw_mci_dma_ops *dma_ops; struct dma_pdata *data; - struct block_settings *blk_settings; }; #endif /* LINUX_MMC_DW_MMC_H */ |