From patchwork Thu May 30 16:02:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2637441 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 92602DF2A1 for ; Thu, 30 May 2013 16:02:44 +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 1Ui5JK-0006qB-8r; Thu, 30 May 2013 16:02:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ui5JH-0003XE-IW; Thu, 30 May 2013 16:02:39 +0000 Received: from moutng.kundenserver.de ([212.227.17.8]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ui5JF-0003UG-7m for linux-arm-kernel@lists.infradead.org; Thu, 30 May 2013 16:02:37 +0000 Received: from axis700.grange (dslb-178-001-225-142.pools.arcor-ip.net [178.1.225.142]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LyjAN-1UKBdq0MEx-016A84; Thu, 30 May 2013 18:02:13 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 883DE40BB4; Thu, 30 May 2013 18:02:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 7D83A40BB3; Thu, 30 May 2013 18:02:12 +0200 (CEST) Date: Thu, 30 May 2013 18:02:12 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-mmc@vger.kernel.org Subject: [PATCH] dmaengine: shdma: fix a build failure on platforms with no DMA support Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:eLDz+pFAVWKWjopoCsMY1ncgYHqLDciKrHlA9EPTc7T oldYFn25r2LmLrFs8lhqGFy7xJEI4VzUy/x+AlPzhy1luufI1q NSCDIRUKhW3Di6Np4ySdSf45wD18AyNE1rgZYPAwZpeK2QFO6C clZMoCnnQydchZMtWe8fv01aDga8nS/NxMwGpkc3jshBVqcg25 VBczeE7cH3pcwaoa4dRGu4xbz816/BXxPvnw3REzbRuRpMsk64 i22z8+ydMUhy6EEUD7Nn3vXXMg1DOwEiwe7gIRdJCnOv8fwz8q AldLpJMILmfn3RMZbzz6VI061ffEEonQqQba/mH2c3Z7IJ2kjU hKVxhWJou8A2oFLmZ98FGSyE/gcLBhNJQ9eu2MOV494xR/a3zN evVbD6kx8nd/Q== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130530_120237_463622_66D95E87 X-CRM114-Status: GOOD ( 12.06 ) 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.8 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 --- 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) bool shdma_chan_filter(struct dma_chan *chan, void *arg); +#else +#define shdma_chan_filter NULL +#endif #endif