[PATCH] dmaengine: of: bail out early if "dmas" property is not present

[PATCH] dmaengine: of: bail out early if "dmas" property is not present

[Wolfram Sang]

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

And don't print an error: not configured is not an error.

Reported-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

In response to Philipp's patch silencing the warning in the driver:
http://patchwork.ozlabs.org/patch/425696/

I think this should be handled in the core.

 drivers/dma/of-dma.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
index d5fbeaa1e7ba..ca31f1b45366 100644
--- a/drivers/dma/of-dma.c
+++ b/drivers/dma/of-dma.c
@@ -159,6 +159,10 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np,
 		return ERR_PTR(-ENODEV);
 	}
 
+	/* Silently fail if there is not even the "dmas" property */
+	if (!of_find_property(np, "dmas", NULL))
+		return ERR_PTR(-ENODEV);
+
 	count = of_property_count_strings(np, "dma-names");
 	if (count < 0) {
 		pr_err("%s: dma-names property of node '%s' missing or empty\n",
-- 
2.1.3

Re: [PATCH] dmaengine: of: bail out early if "dmas" property is not present

[Geert Uytterhoeven]

On Wed, Jan 14, 2015 at 3:16 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> And don't print an error: not configured is not an error.
>
> Reported-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] dmaengine: of: bail out early if "dmas" property is not present

[Laurent Pinchart]

Hi Wolfram,

Thank you for the patch.

On Wednesday 14 January 2015 15:16:28 Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> And don't print an error: not configured is not an error.
> 
> Reported-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

This looks good to me.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> In response to Philipp's patch silencing the warning in the driver:
> http://patchwork.ozlabs.org/patch/425696/
> 
> I think this should be handled in the core.
> 
>  drivers/dma/of-dma.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c
> index d5fbeaa1e7ba..ca31f1b45366 100644
> --- a/drivers/dma/of-dma.c
> +++ b/drivers/dma/of-dma.c
> @@ -159,6 +159,10 @@ struct dma_chan *of_dma_request_slave_channel(struct
> device_node *np, return ERR_PTR(-ENODEV);
>  	}
> 
> +	/* Silently fail if there is not even the "dmas" property */
> +	if (!of_find_property(np, "dmas", NULL))
> +		return ERR_PTR(-ENODEV);
> +
>  	count = of_property_count_strings(np, "dma-names");
>  	if (count < 0) {
>  		pr_err("%s: dma-names property of node '%s' missing or empty\n",

-- 
Regards,

Laurent Pinchart

Re: [PATCH] dmaengine: of: bail out early if "dmas" property is not present

[Philipp Zabel]

Am Mittwoch, den 14.01.2015, 15:16 +0100 schrieb Wolfram Sang:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> And don't print an error: not configured is not an error.
> 
> Reported-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Philipp Zabel <p.zabel@pengutronix.de>

thanks
Philipp

Re: [PATCH] dmaengine: of: bail out early if "dmas" property is not present

[Vinod Koul]

On Wed, Jan 14, 2015 at 03:16:28PM +0100, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> And don't print an error: not configured is not an error.
> 
Applied, thanks

This must be record for Acks per lines :)

-- 
~Vinod