From patchwork Thu May 8 14:56:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4137361 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1DC85BFF02 for ; Thu, 8 May 2014 15:03:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4151F201EC for ; Thu, 8 May 2014 15:02:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55E68201D3 for ; Thu, 8 May 2014 15:02:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471AbaEHPC6 (ORCPT ); Thu, 8 May 2014 11:02:58 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:55715 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbaEHO4m (ORCPT ); Thu, 8 May 2014 10:56:42 -0400 Received: from wuerfel.lan (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue001) with ESMTP (Nemesis) id 0LfsUN-1XA3Wn2FR5-00pc6L; Thu, 08 May 2014 16:56:38 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Tony Lindgren , Russell King , Vinod Koul , dmaengine@vger.kernel.org Subject: [PATCH 1/2] dmaengine: omap: hide filter_fn for built-in drivers Date: Thu, 8 May 2014 16:56:12 +0200 Message-Id: <1399560990-1402858-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399560433-1402630-1-git-send-email-arnd@arndb.de> References: <1399560433-1402630-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:CIqsGp9MKxEPFQhUWT77wfQPa+Xjhyt9Vjx3N+YZcXk v6PPINCGzeEMvD5aDpmKvIGWNEqK9TcVm9lmjG+uOogA7hkiTZ EpXn1EefT0+yHOB/FY62xK9sG3mUmcwEDA8tXukUDzv9DiglmD 6ziMFxd+lfkVma2JLjIfgDbDBPNcH4iZ8kVCuo+ghaNKQeXhL7 f6NWDmBgZb4JMp4W5VcQ5ssN4WpQrM8TE9/51H9g/ITw9JB+U9 VzqMujGq4Wr/3SJesNErcO5xqskUXAssxVq9SGAy2MO26H9ZLV 2ewJ1bZzks8c/syt+TymDmlN+txdwyOsRYc1SYKxeh25/xgUar p66qPr9weabC0pXBe4DmFSAryDZDdQHAdC8HketPu Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is not possible to reference the omap_dma_filter_fn filter function from a built-in driver if the dmaengine driver itself is a loadable module, which is a valid configuration otherwise. This provides only the dummy alternative if the function is referenced by a built-in driver to allow a successful build. The filter function is only required by ATAGS based platforms, which will continue to be broken after this change for the bogus configuration. When booting from DT, with the dma channels correctly listed there, it will work fine. Signed-off-by: Arnd Bergmann Cc: Tony Lindgren Cc: Russell King Cc: Vinod Koul Cc: dmaengine@vger.kernel.org Acked-by: Tony Lindgren --- include/linux/omap-dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index 0a1a2e2..c29a6de 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -10,7 +10,7 @@ struct dma_chan; -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) +#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE)) bool omap_dma_filter_fn(struct dma_chan *, void *); #else static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)