From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933289AbbHXJRw (ORCPT ); Mon, 24 Aug 2015 05:17:52 -0400 Received: from mga01.intel.com ([192.55.52.88]:58777 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932897AbbHXJRs (ORCPT ); Mon, 24 Aug 2015 05:17:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,736,1432623600"; d="scan'208";a="789751047" Date: Mon, 24 Aug 2015 14:49:57 +0530 From: Vinod Koul To: Kuninori Morimoto Cc: Mark Brown , Dan Williams , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Linux-ALSA , Liam Girdwood , Simon Subject: Re: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF Message-ID: <20150824091838.GH13546@localhost> References: <87wpwpurzk.wl%kuninori.morimoto.gx@renesas.com> <20150821082636.GK13546@localhost> <87d1yglvcy.wl%kuninori.morimoto.gx@renesas.com> <87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 21, 2015 at 11:48:37AM +0000, Kuninori Morimoto wrote: > From: Kuninori Morimoto > > 5fa422c ("dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c") > moved OF base DMAEngine code to of-dma.c, then it based on CONFIG_DMA_OF. > But, OF base DMAEngine API on of_dma.h still based on CONFIG_OF now. > So, current kernel can't find OF base DMAEngine API if .config has CONFIG_OF, > but not have CONFIG_DMA_OF. This patch tidyup it. I did a quick build with arm config, but didn't see any failures. But still am worried about random config and other builds may find. So I think it would be safer to merge this patch after merge window so that we have ample time to fix any issue -- ~Vinod > Signed-off-by: Kuninori Morimoto > --- > 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 98ba752..36112cd 100644 > --- a/include/linux/of_dma.h > +++ b/include/linux/of_dma.h > @@ -34,7 +34,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 *), > -- > 1.9.1 >