diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-01-13 00:00:39 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-20 04:24:36 -0500 |
commit | de122cb1745313f331dc7c7923b484343d455e64 (patch) | |
tree | 17a5c62774b3e2960b787747e83914cacad87fc4 /drivers/mmc | |
parent | f45394d5ecd1cf3644a6f1ce7db39ab406ced0a6 (diff) |
mmc: tmio: remove TMIO_MMC_HAVE_CTL_DMA_REG flag
tmio_mmc_host has .enable_dma callback now.
We don't need TMIO_MMC_HAVE_CTL_DMA_REG anymore.
Let's remove it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sh_mobile_sdhi.c | 5 | ||||
-rw-r--r-- | drivers/mmc/host/tmio_mmc_dma.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 7dbcb577f596..6906a905cd54 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c | |||
@@ -291,11 +291,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) | |||
291 | */ | 291 | */ |
292 | mmc_data->flags |= TMIO_MMC_SDIO_STATUS_QUIRK; | 292 | mmc_data->flags |= TMIO_MMC_SDIO_STATUS_QUIRK; |
293 | 293 | ||
294 | /* | ||
295 | * All SDHI have DMA control register | ||
296 | */ | ||
297 | mmc_data->flags |= TMIO_MMC_HAVE_CTL_DMA_REG; | ||
298 | |||
299 | if (of_id && of_id->data) { | 294 | if (of_id && of_id->data) { |
300 | const struct sh_mobile_sdhi_of_data *of_data = of_id->data; | 295 | const struct sh_mobile_sdhi_of_data *of_data = of_id->data; |
301 | mmc_data->flags |= of_data->tmio_flags; | 296 | mmc_data->flags |= of_data->tmio_flags; |
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c index aa5f4b6e790d..331bb618e398 100644 --- a/drivers/mmc/host/tmio_mmc_dma.c +++ b/drivers/mmc/host/tmio_mmc_dma.c | |||
@@ -28,9 +28,6 @@ void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable) | |||
28 | if (!host->chan_tx || !host->chan_rx) | 28 | if (!host->chan_tx || !host->chan_rx) |
29 | return; | 29 | return; |
30 | 30 | ||
31 | if (host->pdata->flags & TMIO_MMC_HAVE_CTL_DMA_REG) | ||
32 | sd_ctrl_write16(host, CTL_DMA_ENABLE, enable ? 2 : 0); | ||
33 | |||
34 | if (host->dma->enable) | 31 | if (host->dma->enable) |
35 | host->dma->enable(host, enable); | 32 | host->dma->enable(host, enable); |
36 | } | 33 | } |