From patchwork Fri Feb 28 00:27:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 3736971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AA4849F2F7 for ; Fri, 28 Feb 2014 00:27:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7A2C2024D for ; Fri, 28 Feb 2014 00:27:44 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 CCE872022D for ; Fri, 28 Feb 2014 00:27:43 +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 1WJBIg-0002Q5-4B; Fri, 28 Feb 2014 00:27:38 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJBId-0001Qu-Oq; Fri, 28 Feb 2014 00:27:35 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJBIa-0001Q4-Kb for linux-arm-kernel@lists.infradead.org; Fri, 28 Feb 2014 00:27:33 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1S0R4j7012508; Thu, 27 Feb 2014 18:27:04 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S0R4pv010948; Thu, 27 Feb 2014 18:27:04 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 18:27:03 -0600 Received: from [158.218.103.219] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S0R3mx031884; Thu, 27 Feb 2014 18:27:03 -0600 Message-ID: <530FD7D7.9000104@ti.com> Date: Thu, 27 Feb 2014 19:27:03 -0500 From: Santosh Shilimkar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Subject: Re: [PATCH] dma: of: Move the functions under CONFIG_OF_DMA instead of CONFIG_OF References: <1393546850-13907-1-git-send-email-santosh.shilimkar@ti.com> In-Reply-To: <1393546850-13907-1-git-send-email-santosh.shilimkar@ti.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_192732_757482_F8173292 X-CRM114-Status: GOOD ( 13.13 ) X-Spam-Score: -6.9 (------) Cc: Grant Likely , Rob Herring , linux-arm-kernel@lists.infradead.org, arnd@arndb.de 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 On Thursday 27 February 2014 07:20 PM, Santosh Shilimkar wrote: > The of-dma.c is compiled out with !CONFIG_OF_DMA but the functions in > the header are kept under CONFIG_OF. Move them under CONFIG_OF_DMA > to avoid build errors with CONFIG_OFF && !CONFIG_OF_DMA > > Cc: Grant Likely > Cc: Rob Herring > Signed-off-by: Santosh Shilimkar > --- > include/linux/of_dma.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h > index 0322363..3d2beab 100644 > --- a/include/linux/of_dma.h > +++ b/include/linux/of_dma.h > @@ -31,7 +31,7 @@ struct of_dma_filter_info { > dma_filter_fn filter_fn; > }; > > -#ifdef CONFIG_OF > +#ifdef CONFIG_OF_DMA Sorry.. Typo here.. Should have been CONFIG_DMA_OF From 31242461b6ba5e8c0c5ee26e394fa4cab61e3aa1 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 27 Feb 2014 19:13:36 -0500 Subject: [PATCH] dma: of: Move the functions under CONFIG_DMA_OF instead of CONFIG_OF The of-dma.c is compiled out with !CONFIG_DMA_OF but the functions in the header are kept under CONFIG_OF. Move them under CONFIG_OF_DMA to avoid build errors with CONFIG_OFF && !CONFIG_DMA_OF Cc: Grant Likely Cc: Rob Herring Signed-off-by: Santosh Shilimkar --- include/linux/of_dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index 0322363..0ea24f4 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -31,7 +31,7 @@ struct of_dma_filter_info { dma_filter_fn filter_fn; }; -#ifdef CONFIG_OF +#ifdef CONFIG_DMA_OF extern int of_dma_controller_register(struct device_node *np, struct dma_chan *(*of_dma_xlate) (struct of_phandle_args *, struct of_dma *),