From patchwork Wed Dec 29 07:59:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 437871 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBT7xW5t001273 for ; Wed, 29 Dec 2010 07:59:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750976Ab0L2H73 (ORCPT ); Wed, 29 Dec 2010 02:59:29 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:58144 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750893Ab0L2H73 (ORCPT ); Wed, 29 Dec 2010 02:59:29 -0500 Received: from axis700.grange (pD9EB929E.dip0.t-ipconnect.de [217.235.146.158]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MDTuj-1PbPJQ1y1N-00GpMG; Wed, 29 Dec 2010 08:59:25 +0100 Received: by axis700.grange (Postfix, from userid 1000) id 2BC9B189AE4; Wed, 29 Dec 2010 08:59:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 226A5189AE3; Wed, 29 Dec 2010 08:59:25 +0100 (CET) Date: Wed, 29 Dec 2010 08:59:25 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: linux-mmc@vger.kernel.org, Chris Ball Subject: [PATCH] mmc: sh_mmcif: make DMA support by the driver unconditional Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:mQ2ODyJBDPhyCplexjzf2akhXjPdbx4ylJvriUhDdjI 53JsEnnU8HxIbgeyQWgFAM6iAcnvjQPlUOXkd15WbVF7MXN10o 7QprZqaSUW7EOWD35CCdVghuQ1rzk0pgF2BOp24QkOO5LRhCYy WGCJN0+mMaqqf7jFJwUeSpicq6YPyF7ib6i2hSMM1f9/bAexXq TwMWFBOmMRbIVA27h3S4Ff+/AJOOfpvLaaNHO1KU0I= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Dec 2010 07:59:33 +0000 (UTC) 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) {