From patchwork Wed Sep 24 19:06:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 4969451 Return-Path: X-Original-To: patchwork-linux-arm@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 56C79BEEA5 for ; Wed, 24 Sep 2014 19:09:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94076201DD for ; Wed, 24 Sep 2014 19:09:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42DB5201B9 for ; Wed, 24 Sep 2014 19:09:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWru2-0000Cr-Up; Wed, 24 Sep 2014 19:07:02 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWrtz-000082-MT for linux-arm-kernel@lists.infradead.org; Wed, 24 Sep 2014 19:07:00 +0000 Received: by mail-pa0-f47.google.com with SMTP id et14so9270667pad.6 for ; Wed, 24 Sep 2014 12:06:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WppHDG6wDFzWP8Z2bxn1O7U7lQG06ZNWEkJNoMZsasc=; b=Gwpczb4ZX/yWkjKBU+tZLN2SbNes9dXnpqLmjhQoyM+wxc8+F+E5jFkkk5mEuxhN3G 6fduv/+1mVSg09MCDfIrz2x15ByGkX9ORHGANauKbF+pLSp+JlanzhF93/tavDO+BG2Z GdouRh2pQirwaLFjQLjfa/jurdRSHYkDCrb96LH2286XRcRCKeC9d3Cg63UgKeIiooMy ttclQM0JArUxCTILaoD3A92ih7P0RFmJgPH6XBSF0fnb+loeGGPw3KSEEvsqr2wSrhA5 +a+nBtJyExmd+5YkewOjGE5nRt3P1vd2k5dnaCgdSh8TWOfmHqw15q3vCmGIb18t6z4F uesA== X-Gm-Message-State: ALoCoQlOY5+HPI/ZBUBiyixk9H+RO41KYQZee9RIIEPZBX8+/CdznrP7LEHEulwxKIK1han5ZhN6 X-Received: by 10.68.125.202 with SMTP id ms10mr11737528pbb.71.1411585598035; Wed, 24 Sep 2014 12:06:38 -0700 (PDT) Received: from localhost.google.com ([104.132.1.111]) by mx.google.com with ESMTPSA id cu3sm57881pbb.48.2014.09.24.12.06.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Sep 2014 12:06:37 -0700 (PDT) From: Olof Johansson To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] drivers/soc: ti: fix build break with modules Date: Wed, 24 Sep 2014 12:06:29 -0700 Message-Id: <1411585589-6108-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <5422CDB1.9060505@ti.com> References: <5422CDB1.9060505@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140924_120659_755732_BE08A6E7 X-CRM114-Status: GOOD ( 11.22 ) X-Spam-Score: -0.9 (/) Cc: Olof Johansson , Santosh Shilimkar , arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Fixes below build break by not switching to stubs when the driver is a module: drivers/soc/ti/knav_dma.c:418:7: error: redefinition of 'knav_dma_open_channel' void *knav_dma_open_channel(struct device *dev, const char *name, ^ In file included from drivers/soc/ti/knav_dma.c:26:0: include/linux/soc/ti/knav_dma.h:165:21: note: previous definition of 'knav_dma_open_channel' was here static inline void *knav_dma_open_channel(struct device *dev, const char *name, ^ Cc: Santosh Shilimkar Signed-off-by: Olof Johansson --- include/linux/soc/ti/knav_dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h index e864a3e..dad035c 100644 --- a/include/linux/soc/ti/knav_dma.h +++ b/include/linux/soc/ti/knav_dma.h @@ -157,7 +157,7 @@ struct knav_dma_desc { u32 pad[4]; } ____cacheline_aligned; -#ifdef CONFIG_KEYSTONE_NAVIGATOR_DMA +#if IS_ENABLED(CONFIG_KEYSTONE_NAVIGATOR_DMA) void *knav_dma_open_channel(struct device *dev, const char *name, struct knav_dma_cfg *config); void knav_dma_close_channel(void *channel);