diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-29 07:59:25 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-05 16:57:42 +0900 |
| commit | f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b (patch) | |
| tree | bc22cd6c7408e1592737c058881f583a804e287c | |
| parent | d8e7943d821d8ee7f48ff38f6f7c509297c88402 (diff) | |
mmc: sh_mmcif: make DMA support by the driver unconditional
Simplify the driver by removing the possibility to build it without the DMA
support and remove the respective Kconfig parameter.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | drivers/mmc/host/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 20 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 859e352d0b5..d618e867399 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -466,12 +466,6 @@ config MMC_SH_MMCIF This driver supports MMCIF in sh7724/sh7757/sh7372. -config SH_MMCIF_DMA - bool "Use DMA for MMCIF" - depends on MMC_SH_MMCIF - help - Use SH dma-engine driver for data transfer - config MMC_JZ4740 tristate "JZ4740 SD/Multimedia Card Interface support" depends on MACH_JZ4740 diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index d09a2b38eee..12884c27017 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -184,7 +184,6 @@ static inline void sh_mmcif_bitclr(struct sh_mmcif_host *host, writel(~val & readl(host->addr + reg), host->addr + reg); } -#ifdef CONFIG_SH_MMCIF_DMA static void mmcif_dma_complete(void *arg) { struct sh_mmcif_host *host = arg; @@ -367,25 +366,6 @@ static void sh_mmcif_release_dma(struct sh_mmcif_host *host) host->dma_sglen = 0; } -#else -static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) -{ -} - -static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host) -{ -} - -static void sh_mmcif_request_dma(struct sh_mmcif_host *host, - struct sh_mmcif_plat_data *pdata) -{ - /* host->chan_tx, host->chan_tx and host->dma_sglen are all zero */ -} - -static void sh_mmcif_release_dma(struct sh_mmcif_host *host) -{ -} -#endif static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk) { |