Unverified Commit ef12f373 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: img: Use dev_err_probe() helper 



Use the dev_err_probe() helper, instead of open-coding the same
operation.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20211214020843.2225831-16-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7a0299e1

sound/soc/img/img-i2s-in.c

+3 −5
Original line number Diff line number Diff line
@@ -451,11 +451,9 @@ static int img_i2s_in_probe(struct platform_device *pdev) 
	i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);



	i2s->clk_sys = devm_clk_get(dev, "sys");

	if (IS_ERR(i2s->clk_sys)) {

		if (PTR_ERR(i2s->clk_sys) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'sys'\n");

		return PTR_ERR(i2s->clk_sys);

	}

	if (IS_ERR(i2s->clk_sys))

		return dev_err_probe(dev, PTR_ERR(i2s->clk_sys),

				     "Failed to acquire clock 'sys'\n");



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

sound/soc/img/img-i2s-out.c

+9 −15
Original line number Diff line number Diff line
@@ -457,25 +457,19 @@ static int img_i2s_out_probe(struct platform_device *pdev) 
	i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);



	i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");

	if (IS_ERR(i2s->rst)) {

		if (PTR_ERR(i2s->rst) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "No top level reset found\n");

		return PTR_ERR(i2s->rst);

	}

	if (IS_ERR(i2s->rst))

		return dev_err_probe(&pdev->dev, PTR_ERR(i2s->rst),

				     "No top level reset found\n");



	i2s->clk_sys = devm_clk_get(&pdev->dev, "sys");

	if (IS_ERR(i2s->clk_sys)) {

		if (PTR_ERR(i2s->clk_sys) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'sys'\n");

		return PTR_ERR(i2s->clk_sys);

	}

	if (IS_ERR(i2s->clk_sys))

		return dev_err_probe(dev, PTR_ERR(i2s->clk_sys),

				     "Failed to acquire clock 'sys'\n");



	i2s->clk_ref = devm_clk_get(&pdev->dev, "ref");

	if (IS_ERR(i2s->clk_ref)) {

		if (PTR_ERR(i2s->clk_ref) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'ref'\n");

		return PTR_ERR(i2s->clk_ref);

	}

	if (IS_ERR(i2s->clk_ref))

		return dev_err_probe(dev, PTR_ERR(i2s->clk_ref),

				     "Failed to acquire clock 'ref'\n");



	i2s->suspend_ch_ctl = devm_kcalloc(dev,

		i2s->max_i2s_chan, sizeof(*i2s->suspend_ch_ctl), GFP_KERNEL);

sound/soc/img/img-parallel-out.c

+9 −15
Original line number Diff line number Diff line
@@ -229,25 +229,19 @@ static int img_prl_out_probe(struct platform_device *pdev) 
	prl->base = base;



	prl->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");

	if (IS_ERR(prl->rst)) {

		if (PTR_ERR(prl->rst) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "No top level reset found\n");

		return PTR_ERR(prl->rst);

	}

	if (IS_ERR(prl->rst))

		return dev_err_probe(&pdev->dev, PTR_ERR(prl->rst),

				     "No top level reset found\n");



	prl->clk_sys = devm_clk_get(&pdev->dev, "sys");

	if (IS_ERR(prl->clk_sys)) {

		if (PTR_ERR(prl->clk_sys) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'sys'\n");

		return PTR_ERR(prl->clk_sys);

	}

	if (IS_ERR(prl->clk_sys))

		return dev_err_probe(dev, PTR_ERR(prl->clk_sys),

				     "Failed to acquire clock 'sys'\n");



	prl->clk_ref = devm_clk_get(&pdev->dev, "ref");

	if (IS_ERR(prl->clk_ref)) {

		if (PTR_ERR(prl->clk_ref) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'ref'\n");

		return PTR_ERR(prl->clk_ref);

	}

	if (IS_ERR(prl->clk_ref))

		return dev_err_probe(dev, PTR_ERR(prl->clk_ref),

				     "Failed to acquire clock 'ref'\n");



	ret = clk_prepare_enable(prl->clk_sys);

	if (ret)

sound/soc/img/img-spdif-in.c

+3 −5
Original line number Diff line number Diff line
@@ -739,11 +739,9 @@ static int img_spdif_in_probe(struct platform_device *pdev) 
	spdif->base = base;



	spdif->clk_sys = devm_clk_get(dev, "sys");

	if (IS_ERR(spdif->clk_sys)) {

		if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'sys'\n");

		return PTR_ERR(spdif->clk_sys);

	}

	if (IS_ERR(spdif->clk_sys))

		return dev_err_probe(dev, PTR_ERR(spdif->clk_sys),

				     "Failed to acquire clock 'sys'\n");



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

sound/soc/img/img-spdif-out.c

+9 −15
Original line number Diff line number Diff line
@@ -342,25 +342,19 @@ static int img_spdif_out_probe(struct platform_device *pdev) 
	spdif->base = base;



	spdif->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");

	if (IS_ERR(spdif->rst)) {

		if (PTR_ERR(spdif->rst) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "No top level reset found\n");

		return PTR_ERR(spdif->rst);

	}

	if (IS_ERR(spdif->rst))

		return dev_err_probe(&pdev->dev, PTR_ERR(spdif->rst),

				     "No top level reset found\n");



	spdif->clk_sys = devm_clk_get(&pdev->dev, "sys");

	if (IS_ERR(spdif->clk_sys)) {

		if (PTR_ERR(spdif->clk_sys) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'sys'\n");

		return PTR_ERR(spdif->clk_sys);

	}

	if (IS_ERR(spdif->clk_sys))

		return dev_err_probe(dev, PTR_ERR(spdif->clk_sys),

				     "Failed to acquire clock 'sys'\n");



	spdif->clk_ref = devm_clk_get(&pdev->dev, "ref");

	if (IS_ERR(spdif->clk_ref)) {

		if (PTR_ERR(spdif->clk_ref) != -EPROBE_DEFER)

			dev_err(dev, "Failed to acquire clock 'ref'\n");

		return PTR_ERR(spdif->clk_ref);

	}

	if (IS_ERR(spdif->clk_ref))

		return dev_err_probe(dev, PTR_ERR(spdif->clk_ref),

				     "Failed to acquire clock 'ref'\n");



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {