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: 25496 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1FEE820543 for ; Fri, 28 Feb 2014 00:27:51 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id lx4sf11409900iec.2 for ; Thu, 27 Feb 2014 16:27:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:subject:references:in-reply-to:cc:precedence :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=NXf+sxUlZBLOeEA22F3UdzDqFmQOQ1c5Wg7QLGBvxoM=; b=iL2GRbq/+MpIaQxzem1vwCBg1sDezLp8UY+6uIlOOKZc2vXJCciTeJkpVExcSOu2YM mMMqLdl8B0dzyQ+VjDMRVdKAu34wVLbX7jOiyI0DZATjr1e82x/ZPz09rpqWNXPnns1g bObKV+z0Cu3tuPSxzpxLCieZvipWwHtipCS5ZWLpbbWhxg7m/oEq+DwHLKW8ZmPK1Egu Xw64v7Jw8YLcB3o8qUln2sXsHSXebO/9Tb5OqtnBzX2ay7qHKbaEd+D6VknOJHDcGoeA gx1Uwj8X9xoOlWydQQKLeX4z8CrP1X7o3QLIlz/ERR3MW9ngGim3DqfLSk+0gEAsyIPb kr8A== X-Gm-Message-State: ALoCoQnKwXOcpNOppHl/vxj2IL+nTMsX57DzKntjhYY9kwgEmVcJEuq9jWYmfzHlqAP3TC7DvbaY X-Received: by 10.182.52.136 with SMTP id t8mr2945135obo.41.1393547270502; Thu, 27 Feb 2014 16:27:50 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.161 with SMTP id o30ls992383qga.94.gmail; Thu, 27 Feb 2014 16:27:50 -0800 (PST) X-Received: by 10.220.98.204 with SMTP id r12mr29905vcn.48.1393547270389; Thu, 27 Feb 2014 16:27:50 -0800 (PST) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id b2si2343780vcy.10.2014.02.27.16.27.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 16:27:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so3144671veb.0 for ; Thu, 27 Feb 2014 16:27:50 -0800 (PST) X-Received: by 10.58.187.161 with SMTP id ft1mr27253vec.54.1393547270126; Thu, 27 Feb 2014 16:27:50 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp15729vcs; Thu, 27 Feb 2014 16:27:49 -0800 (PST) X-Received: by 10.180.198.178 with SMTP id jd18mr579403wic.47.1393547268951; Thu, 27 Feb 2014 16:27:48 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id u13si336472wie.14.2014.02.27.16.27.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Feb 2014 16:27:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; 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-0002Q4-2o; 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 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: santosh.shilimkar@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 *),