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

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


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

sound/soc/samsung/aries_wm8994.c

+7 −10
Original line number Diff line number Diff line
@@ -585,19 +585,16 @@ static int aries_audio_probe(struct platform_device *pdev) 


	extcon_np = of_parse_phandle(np, "extcon", 0);

	priv->usb_extcon = extcon_find_edev_by_node(extcon_np);

	if (IS_ERR(priv->usb_extcon)) {

		if (PTR_ERR(priv->usb_extcon) != -EPROBE_DEFER)

			dev_err(dev, "Failed to get extcon device");

		return PTR_ERR(priv->usb_extcon);

	}

	if (IS_ERR(priv->usb_extcon))

		return dev_err_probe(dev, PTR_ERR(priv->usb_extcon),

				     "Failed to get extcon device");

	of_node_put(extcon_np);



	priv->adc = devm_iio_channel_get(dev, "headset-detect");

	if (IS_ERR(priv->adc)) {

		if (PTR_ERR(priv->adc) != -EPROBE_DEFER)

			dev_err(dev, "Failed to get ADC channel");

		return PTR_ERR(priv->adc);

	}

	if (IS_ERR(priv->adc))

		return dev_err_probe(dev, PTR_ERR(priv->adc),

				     "Failed to get ADC channel");



	if (priv->adc->channel->type != IIO_VOLTAGE)

		return -EINVAL;

sound/soc/samsung/arndale.c

+2 −3
Original line number Diff line number Diff line
@@ -174,9 +174,8 @@ static int arndale_audio_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(card->dev, card);

	if (ret) {

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"snd_soc_register_card() failed: %d\n", ret);

		dev_err_probe(&pdev->dev, ret,

			      "snd_soc_register_card() failed\n");

		goto err_put_of_nodes;

	}

	return 0;

sound/soc/samsung/littlemill.c

+2 −3
Original line number Diff line number Diff line
@@ -325,9 +325,8 @@ static int littlemill_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

	if (ret)

		dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");



	return ret;

}

sound/soc/samsung/lowland.c

+2 −3
Original line number Diff line number Diff line
@@ -183,9 +183,8 @@ static int lowland_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

	if (ret)

		dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");



	return ret;

}

sound/soc/samsung/odroid.c

+1 −3
Original line number Diff line number Diff line
@@ -311,9 +311,7 @@ static int odroid_audio_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(dev, card);

	if (ret < 0) {

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "snd_soc_register_card() failed: %d\n",

				ret);

		dev_err_probe(dev, ret, "snd_soc_register_card() failed\n");

		goto err_put_clk_i2s;

	}