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: 2640051 Return-Path: X-Original-To: patchwork-linux-sh@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 48DF0DF2A1 for ; Fri, 31 May 2013 03:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099Ab3EaDCJ (ORCPT ); Thu, 30 May 2013 23:02:09 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:53645 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935Ab3EaDCI (ORCPT ); Thu, 30 May 2013 23:02:08 -0400 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 cc: linux-sh@vger.kernel.org, Simon Horman , Chris Ball , linux-arm-kernel@lists.infradead.org, Kevin Hilman 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== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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 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