[alsa-devel] [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF

[Vinod Koul]

On Fri, Aug 21, 2015 at 11:48:37AM +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> 
> 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 <kuninori.morimoto.gx at renesas.com>
> ---
>  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
>