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: 2637671 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A80F4E01D7 for ; Thu, 30 May 2013 16:07:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934520Ab3E3QGu (ORCPT ); Thu, 30 May 2013 12:06:50 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:59406 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934858Ab3E3QCn (ORCPT ); Thu, 30 May 2013 12:02:43 -0400 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 cc: linux-sh@vger.kernel.org, Simon Horman , Chris Ball , linux-arm-kernel@lists.infradead.org, Kevin Hilman 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== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.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