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

Commit 633154d3 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove unneeded suspend checks from CODEC drivers 



Better integration of the core with the device model means that we now
no longer get the ASoC suspend and resume callbacks without the card
having been set up.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent adcb8bc0

sound/soc/codecs/wm8753.c

+0 −8
Original line number Diff line number Diff line
@@ -1507,10 +1507,6 @@ static int wm8753_suspend(struct platform_device *pdev, pm_message_t state) 
	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;



	/* we only need to suspend if we are a valid card */

	if (!codec->card)

		return 0;



	wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}
@@ -1523,10 +1519,6 @@ static int wm8753_resume(struct platform_device *pdev) 
	u8 data[2];

	u16 *cache = codec->reg_cache;



	/* we only need to resume if we are a valid card */

	if (!codec->card)

		return 0;



	/* Sync reg_cache with the hardware */

	for (i = 0; i < ARRAY_SIZE(wm8753_reg); i++) {

		if (i + 1 == WM8753_RESET)

sound/soc/codecs/wm8990.c

+0 −8
Original line number Diff line number Diff line
@@ -1319,10 +1319,6 @@ static int wm8990_suspend(struct platform_device *pdev, pm_message_t state) 
	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;



	/* we only need to suspend if we are a valid card */

	if (!codec->card)

		return 0;



	wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}
@@ -1335,10 +1331,6 @@ static int wm8990_resume(struct platform_device *pdev) 
	u8 data[2];

	u16 *cache = codec->reg_cache;



	/* we only need to resume if we are a valid card */

	if (!codec->card)

		return 0;



	/* Sync reg_cache with the hardware */

	for (i = 0; i < ARRAY_SIZE(wm8990_reg); i++) {

		if (i + 1 == WM8990_RESET)