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

ASoC: meson: 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-17-kuninori.morimoto.gx@renesas.com


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

sound/soc/meson/aiu.c

+11 −25
Original line number Diff line number Diff line
@@ -218,34 +218,23 @@ static int aiu_clk_get(struct device *dev) 
	int ret;



	aiu->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(aiu->pclk)) {

		if (PTR_ERR(aiu->pclk) != -EPROBE_DEFER)

			dev_err(dev, "Can't get the aiu pclk\n");

		return PTR_ERR(aiu->pclk);

	}

	if (IS_ERR(aiu->pclk))

		return dev_err_probe(dev, PTR_ERR(aiu->pclk), "Can't get the aiu pclk\n");



	aiu->spdif_mclk = devm_clk_get(dev, "spdif_mclk");

	if (IS_ERR(aiu->spdif_mclk)) {

		if (PTR_ERR(aiu->spdif_mclk) != -EPROBE_DEFER)

			dev_err(dev, "Can't get the aiu spdif master clock\n");

		return PTR_ERR(aiu->spdif_mclk);

	}

	if (IS_ERR(aiu->spdif_mclk))

		return dev_err_probe(dev, PTR_ERR(aiu->spdif_mclk),

				     "Can't get the aiu spdif master clock\n");



	ret = aiu_clk_bulk_get(dev, aiu_i2s_ids, ARRAY_SIZE(aiu_i2s_ids),

			       &aiu->i2s);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Can't get the i2s clocks\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Can't get the i2s clocks\n");



	ret = aiu_clk_bulk_get(dev, aiu_spdif_ids, ARRAY_SIZE(aiu_spdif_ids),

			       &aiu->spdif);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Can't get the spdif clocks\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Can't get the spdif clocks\n");



	ret = clk_prepare_enable(aiu->pclk);

	if (ret) {
@@ -281,11 +270,8 @@ static int aiu_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, aiu);



	ret = device_reset(dev);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "Failed to reset device\n");

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "Failed to reset device\n");



	regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(regs))

sound/soc/meson/axg-fifo.c

+4 −12
Original line number Diff line number Diff line
@@ -351,20 +351,12 @@ int axg_fifo_probe(struct platform_device *pdev) 
	}



	fifo->pclk = devm_clk_get(dev, NULL);

	if (IS_ERR(fifo->pclk)) {

		if (PTR_ERR(fifo->pclk) != -EPROBE_DEFER)

			dev_err(dev, "failed to get pclk: %ld\n",

				PTR_ERR(fifo->pclk));

		return PTR_ERR(fifo->pclk);

	}

	if (IS_ERR(fifo->pclk))

		return dev_err_probe(dev, PTR_ERR(fifo->pclk), "failed to get pclk\n");



	fifo->arb = devm_reset_control_get_exclusive(dev, NULL);

	if (IS_ERR(fifo->arb)) {

		if (PTR_ERR(fifo->arb) != -EPROBE_DEFER)

			dev_err(dev, "failed to get arb reset: %ld\n",

				PTR_ERR(fifo->arb));

		return PTR_ERR(fifo->arb);

	}

	if (IS_ERR(fifo->arb))

		return dev_err_probe(dev, PTR_ERR(fifo->arb), "failed to get arb reset\n");



	fifo->irq = of_irq_get(dev->of_node, 0);

	if (fifo->irq <= 0) {

sound/soc/meson/axg-pdm.c

+6 −19
Original line number Diff line number Diff line
@@ -586,7 +586,6 @@ static int axg_pdm_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct axg_pdm *priv;

	void __iomem *regs;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -611,28 +610,16 @@ static int axg_pdm_probe(struct platform_device *pdev) 
	}



	priv->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(priv->pclk)) {

		ret = PTR_ERR(priv->pclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get pclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->pclk))

		return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n");



	priv->dclk = devm_clk_get(dev, "dclk");

	if (IS_ERR(priv->dclk)) {

		ret = PTR_ERR(priv->dclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get dclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->dclk))

		return dev_err_probe(dev, PTR_ERR(priv->dclk), "failed to get dclk\n");



	priv->sysclk = devm_clk_get(dev, "sysclk");

	if (IS_ERR(priv->sysclk)) {

		ret = PTR_ERR(priv->sysclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get dclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->sysclk))

		return dev_err_probe(dev, PTR_ERR(priv->sysclk), "failed to get dclk\n");



	return devm_snd_soc_register_component(dev, &axg_pdm_component_drv,

					       &axg_pdm_dai_drv, 1);

sound/soc/meson/axg-spdifin.c

+4 −13
Original line number Diff line number Diff line
@@ -454,7 +454,6 @@ static int axg_spdifin_probe(struct platform_device *pdev) 
	struct axg_spdifin *priv;

	struct snd_soc_dai_driver *dai_drv;

	void __iomem *regs;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -479,20 +478,12 @@ static int axg_spdifin_probe(struct platform_device *pdev) 
	}



	priv->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(priv->pclk)) {

		ret = PTR_ERR(priv->pclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get pclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->pclk))

		return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n");



	priv->refclk = devm_clk_get(dev, "refclk");

	if (IS_ERR(priv->refclk)) {

		ret = PTR_ERR(priv->refclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get mclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->refclk))

		return dev_err_probe(dev, PTR_ERR(priv->refclk), "failed to get mclk\n");



	dai_drv = axg_spdifin_get_dai_drv(dev, priv);

	if (IS_ERR(dai_drv)) {

sound/soc/meson/axg-spdifout.c

+4 −13
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ static int axg_spdifout_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct axg_spdifout *priv;

	void __iomem *regs;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)
@@ -422,20 +421,12 @@ static int axg_spdifout_probe(struct platform_device *pdev) 
	}



	priv->pclk = devm_clk_get(dev, "pclk");

	if (IS_ERR(priv->pclk)) {

		ret = PTR_ERR(priv->pclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get pclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->pclk))

		return dev_err_probe(dev, PTR_ERR(priv->pclk), "failed to get pclk\n");



	priv->mclk = devm_clk_get(dev, "mclk");

	if (IS_ERR(priv->mclk)) {

		ret = PTR_ERR(priv->mclk);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "failed to get mclk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(priv->mclk))

		return dev_err_probe(dev, PTR_ERR(priv->mclk), "failed to get mclk\n");



	return devm_snd_soc_register_component(dev, &axg_spdifout_component_drv,

			axg_spdifout_dai_drv, ARRAY_SIZE(axg_spdifout_dai_drv));