Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70263cb4 authored by Wei Yongjun's avatar Wei Yongjun Committed by Mark Brown
Browse files

ASoC: rcar: fix return value check in rsnd_gen1_probe() 



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 redundant
error message.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ae5c3223

sound/soc/sh/rcar/gen.c

+4 −13
Original line number Diff line number Diff line
@@ -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");