|
@@ -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))
|