lkml.org 
[lkml]   [2013]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH -next] ASoC: rcar: fix return value check in rsnd_gen1_probe()

Hi Wei

Thank you for your patch

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function devm_ioremap_resource() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should be
> replaced with IS_ERR(), and also remove the dev_err call to avoid redundants
> error message.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> sound/soc/sh/rcar/gen.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
> index 5e4ae0d..61232cd 100644
> --- a/sound/soc/sh/rcar/gen.c
> +++ b/sound/soc/sh/rcar/gen.c
> @@ -150,25 +150,16 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
> sru_res = platform_get_resource(pdev, IORESOURCE_MEM, RSND_GEN1_SRU);
> adg_res = platform_get_resource(pdev, IORESOURCE_MEM, RSND_GEN1_ADG);
> ssi_res = platform_get_resource(pdev, IORESOURCE_MEM, RSND_GEN1_SSI);
> - if (!sru_res ||
> - !adg_res ||
> - !ssi_res) {
> - dev_err(dev, "Not enough SRU/SSI/ADG platform resources.\n");
> - return -ENODEV;
> - }
> -
> - gen->ops = &rsnd_gen1_ops;
>
> gen->base[RSND_GEN1_SRU] = devm_ioremap_resource(dev, sru_res);
> gen->base[RSND_GEN1_ADG] = devm_ioremap_resource(dev, adg_res);
> gen->base[RSND_GEN1_SSI] = devm_ioremap_resource(dev, ssi_res);
> - if (!gen->base[RSND_GEN1_SRU] ||
> - !gen->base[RSND_GEN1_ADG] ||
> - !gen->base[RSND_GEN1_SSI]) {
> - dev_err(dev, "SRU/SSI/ADG ioremap failed\n");
> + if (IS_ERR(gen->base[RSND_GEN1_SRU]) ||
> + IS_ERR(gen->base[RSND_GEN1_ADG]) ||
> + IS_ERR(gen->base[RSND_GEN1_SSI]))
> return -ENODEV;
> - }
>
> + gen->ops = &rsnd_gen1_ops;
> rsnd_gen1_reg_map_init(gen);
>
> dev_dbg(dev, "Gen1 device probed\n");
>


\
 
 \ /
  Last update: 2013-07-30 02:21    [W:0.123 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site