forked from Minki/linux
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: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
parent
adcb8bc02d
commit
633154d3a7
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user