Unverified Commit f1f8a961 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: remove device_properties for Atom boards 



Prepare the transition to the software node API by removing device
properties in the probe error handling and .remove callback.

Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210813151116.23931-8-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/bytcht_es8316.c

+2 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) 
	return 0;



err_put_codec:

	device_remove_properties(priv->codec_dev);

	put_device(priv->codec_dev);

	return ret;

}
@@ -625,6 +626,7 @@ static int snd_byt_cht_es8316_mc_remove(struct platform_device *pdev) 
	struct byt_cht_es8316_private *priv = snd_soc_card_get_drvdata(card);



	gpiod_put(priv->speaker_en_gpio);

	device_remove_properties(priv->codec_dev);

	put_device(priv->codec_dev);

	return 0;

}

sound/soc/intel/boards/bytcr_rt5640.c

+4 −1
Original line number Diff line number Diff line
@@ -1481,7 +1481,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	/* Must be called before register_card, also see declaration comment. */

	ret_val = byt_rt5640_add_codec_device_props(codec_dev, priv);

	if (ret_val)

		goto err;

		goto err_device;



	log_quirks(&pdev->dev);
@@ -1584,6 +1584,8 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	return ret_val;



err:

	device_remove_properties(priv->codec_dev);

err_device:

	put_device(priv->codec_dev);

	return ret_val;

}
@@ -1593,6 +1595,7 @@ static int snd_byt_rt5640_mc_remove(struct platform_device *pdev) 
	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct byt_rt5640_private *priv = snd_soc_card_get_drvdata(card);



	device_remove_properties(priv->codec_dev);

	put_device(priv->codec_dev);

	return 0;

}

sound/soc/intel/boards/bytcr_rt5651.c

+4 −1
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	/* Must be called before register_card, also see declaration comment. */

	ret_val = byt_rt5651_add_codec_device_props(codec_dev);

	if (ret_val)

		goto err;

		goto err_device;



	/* Cherry Trail devices use an external amplifier enable gpio */

	if (soc_intel_is_cht() && !byt_rt5651_gpios)
@@ -1125,6 +1125,8 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	return ret_val;



err:

	device_remove_properties(priv->codec_dev);

err_device:

	put_device(priv->codec_dev);

	return ret_val;

}
@@ -1134,6 +1136,7 @@ static int snd_byt_rt5651_mc_remove(struct platform_device *pdev) 
	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card);



	device_remove_properties(priv->codec_dev);

	put_device(priv->codec_dev);

	return 0;

}