From patchwork Fri May 31 03:01:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2640071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 35EF7DF2A1 for ; Fri, 31 May 2013 03:11:17 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiFjw-0003u6-HG; Fri, 31 May 2013 03:10:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiFjt-0006g6-Iu; Fri, 31 May 2013 03:10:49 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiFbR-0006Lo-L8 for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 03:02:06 +0000 Received: from axis700.grange (dslb-178-001-142-153.pools.arcor-ip.net [178.1.142.153]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MOiGM-1UoHk53PFe-0063pA; Fri, 31 May 2013 05:01:32 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 3EFDA40BB4; Fri, 31 May 2013 05:01:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 3CC1840BB3; Fri, 31 May 2013 05:01:31 +0200 (CEST) Date: Fri, 31 May 2013 05:01:31 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-mmc@vger.kernel.org Subject: [PATCH v2] dmaengine: shdma: fix a build failure on platforms with no DMA support Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:T5K7BSEtG2h0tCf/BVY2Mh3Ui5gM2EeZ2RqKpAH5Bw2 Uql43lTCh+SaVv6KHL2WsI2zlLDSahlCUGYgPAIvZjEkE9jxRg kTTY0KRX6rghJWbupNDQe7T8eA/X9UhrFba6+NzYDxgWGeFDw/ WOPMqzPCAPkWtecVeeLt6ZXdsEXa6AdA2gxrkX/AF6gxBmt9v/ I7wS1jN5zUZATC8kUcGXBMY51JoU4+BKJHK1W8J/IifuoEmMXw 24TAcQCjYuzfO754gzWuJTjbHS1MpUpbuPLUaGteEDJT2a4gy1 aL5ISjcrjvP/ncdFd82d+LKu+CT++MAqjE0ppDY9K+gQWz/v78 bj8b/g9s851mjbwrVGKQ/5cYGYU0HHonH8ogRmBALyWxsp9N67 Tn1VFdk62v+/w== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130530_230205_900394_D31FB4D1 X-CRM114-Status: GOOD ( 12.62 ) X-Spam-Score: -3.0 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (g.liakhovetski[at]gmx.de) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , Simon Horman , Chris Ball , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On platforms with no support for the shdma dmaengine driver build is currently failing with drivers/built-in.o: In function `sh_mobile_sdhi_probe': drivers/mmc/host/sh_mobile_sdhi.c:170: undefined reference to`shdma_chan_filter' Fix the breakage by defining shdma_chan_filter to NULL in such configurations. Signed-off-by: Guennadi Liakhovetski Acked-by: Simon Horman --- v2: in "next" shdma_chan_filter() is defined in shdma-base.c, which is built if CONFIG_SH_DMAE_BASE is defined. This version uses the correct symbol. This is for "next." Compile-tested only. I'll test it on hardware next week, but I don't think it shall break anything. include/linux/sh_dma.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index b64d6be..1fd8a20 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h @@ -99,6 +99,10 @@ struct sh_dmae_pdata { #define CHCR_TE 0x00000002 #define CHCR_IE 0x00000004 +#if IS_ENABLED(CONFIG_SH_DMAE_BASE) bool shdma_chan_filter(struct dma_chan *chan, void *arg); +#else +#define shdma_chan_filter NULL +#endif #endif