All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, \@localhost
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
	Simon <horms@verge.net.au>,
	linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	dmaengine@vger.kernel.org,
	Dan Williams <dan.j.williams@intel.com>
Subject: Re: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
Date: Mon, 24 Aug 2015 14:48:38 +0530	[thread overview]
Message-ID: <20150824091838.GH13546@localhost> (raw)
In-Reply-To: <87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vinod.koul@intel.com>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Mark Brown <broonie@kernel.org>,
	Dan Williams <dan.j.williams@intel.com>,
	dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
	Linux-ALSA <alsa-devel@alsa-project.org>,
	Liam Girdwood <lgirdwood@gmail.com>, Simon <horms@verge.net.au>
Subject: Re: [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF
Date: Mon, 24 Aug 2015 14:49:57 +0530	[thread overview]
Message-ID: <20150824091838.GH13546@localhost> (raw)
In-Reply-To: <87bne0lvbe.wl%kuninori.morimoto.gx@renesas.com>

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

  reply	other threads:[~2015-08-24  9:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-21  5:35 CONFIG_OF vs DMA_OF Kuninori Morimoto
2015-08-21  8:26 ` Vinod Koul
2015-08-21 11:47   ` [PATCH 0/2] " Kuninori Morimoto
2015-08-21 11:47     ` Kuninori Morimoto
2015-08-21 11:48     ` [PATCH 1/2] dmaengine: OF DMAEngine API based on CONFIG_DMA_OF instead of CONFIG_OF Kuninori Morimoto
2015-08-21 11:48       ` Kuninori Morimoto
2015-08-24  9:18       ` Vinod Koul [this message]
2015-08-24  9:19         ` Vinod Koul
2015-08-25  0:15         ` Kuninori Morimoto
2015-08-25  0:15           ` Kuninori Morimoto
2015-09-10  8:26           ` [alsa-devel] " Kuninori Morimoto
2015-09-10  8:26             ` Kuninori Morimoto
2015-09-16  1:37             ` Kuninori Morimoto
2015-09-16  1:37               ` Kuninori Morimoto
2015-09-28  8:43             ` Kuninori Morimoto
2015-09-28  8:43               ` Kuninori Morimoto
2015-10-01  2:10             ` Vinod Koul
2015-10-02  0:33               ` Kuninori Morimoto
2015-10-02  0:33                 ` Kuninori Morimoto
2015-08-21 11:49     ` [PATCH 2/2] ASoC: rsnd: SND_SOC_RCAR doesn't depend on DMA_OF Kuninori Morimoto
2015-08-21 11:49       ` Kuninori Morimoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150824091838.GH13546@localhost \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=horms@verge.net.au \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.