linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional
@ 2010-12-29  7:59 Guennadi Liakhovetski
  2011-01-05  1:45 ` Magnus Damm
  0 siblings, 1 reply; 3+ messages in thread
From: Guennadi Liakhovetski @ 2010-12-29  7:59 UTC (permalink / raw)
  To: linux-sh; +Cc: linux-mmc, Chris Ball

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>
---
 drivers/mmc/host/Kconfig    |    6 ------
 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 859e352..d618e86 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 d09a2b3..12884c2 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)
 {
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional
  2010-12-29  7:59 [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional Guennadi Liakhovetski
@ 2011-01-05  1:45 ` Magnus Damm
  2011-01-05  7:57   ` Paul Mundt
  0 siblings, 1 reply; 3+ messages in thread
From: Magnus Damm @ 2011-01-05  1:45 UTC (permalink / raw)
  To: Guennadi Liakhovetski; +Cc: linux-sh, linux-mmc, Chris Ball

On Wed, Dec 29, 2010 at 4:59 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> wrote:
> 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>

Excellent, this helps against bitrot and makes kernel configuration
easier for newbies.

Acked-by: Magnus Damm <damm@opensource.se>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional
  2011-01-05  1:45 ` Magnus Damm
@ 2011-01-05  7:57   ` Paul Mundt
  0 siblings, 0 replies; 3+ messages in thread
From: Paul Mundt @ 2011-01-05  7:57 UTC (permalink / raw)
  To: Magnus Damm; +Cc: Guennadi Liakhovetski, linux-sh, linux-mmc, Chris Ball

On Wed, Jan 05, 2011 at 10:45:49AM +0900, Magnus Damm wrote:
> On Wed, Dec 29, 2010 at 4:59 PM, Guennadi Liakhovetski
> <g.liakhovetski@gmx.de> wrote:
> > 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>
> 
> Excellent, this helps against bitrot and makes kernel configuration
> easier for newbies.
> 
> Acked-by: Magnus Damm <damm@opensource.se>

Applied to rmobile/mmcif, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-01-05  7:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-29  7:59 [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional Guennadi Liakhovetski
2011-01-05  1:45 ` Magnus Damm
2011-01-05  7:57   ` Paul Mundt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).