Commit f7dd3611 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d8e7943d

drivers/mmc/host/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

drivers/mmc/host/sh_mmcif.c

+0 −20
Original line number Diff line number Diff line
@@ -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)

{