diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-24 08:42:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-31 07:44:28 -0500 |
commit | 633154d3a7bbd542465b905392bf76b780f00b4f (patch) | |
tree | 265c5bed705949aa2aa12e03057445103bb93bdf | |
parent | adcb8bc02d86259c117a03b54e9918e5ad3121af (diff) |
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>
-rw-r--r-- | sound/soc/codecs/wm8753.c | 8 | ||||
-rw-r--r-- | sound/soc/codecs/wm8990.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index d6850dacda29..c2444e7c8480 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -1507,10 +1507,6 @@ static int wm8753_suspend(struct platform_device *pdev, pm_message_t state) | |||
1507 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 1507 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
1508 | struct snd_soc_codec *codec = socdev->card->codec; | 1508 | struct snd_soc_codec *codec = socdev->card->codec; |
1509 | 1509 | ||
1510 | /* we only need to suspend if we are a valid card */ | ||
1511 | if (!codec->card) | ||
1512 | return 0; | ||
1513 | |||
1514 | wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); | 1510 | wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); |
1515 | return 0; | 1511 | return 0; |
1516 | } | 1512 | } |
@@ -1523,10 +1519,6 @@ static int wm8753_resume(struct platform_device *pdev) | |||
1523 | u8 data[2]; | 1519 | u8 data[2]; |
1524 | u16 *cache = codec->reg_cache; | 1520 | u16 *cache = codec->reg_cache; |
1525 | 1521 | ||
1526 | /* we only need to resume if we are a valid card */ | ||
1527 | if (!codec->card) | ||
1528 | return 0; | ||
1529 | |||
1530 | /* Sync reg_cache with the hardware */ | 1522 | /* Sync reg_cache with the hardware */ |
1531 | for (i = 0; i < ARRAY_SIZE(wm8753_reg); i++) { | 1523 | for (i = 0; i < ARRAY_SIZE(wm8753_reg); i++) { |
1532 | if (i + 1 == WM8753_RESET) | 1524 | if (i + 1 == WM8753_RESET) |
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 341481e0e830..a54dc77b7f34 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c | |||
@@ -1319,10 +1319,6 @@ static int wm8990_suspend(struct platform_device *pdev, pm_message_t state) | |||
1319 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); | 1319 | struct snd_soc_device *socdev = platform_get_drvdata(pdev); |
1320 | struct snd_soc_codec *codec = socdev->card->codec; | 1320 | struct snd_soc_codec *codec = socdev->card->codec; |
1321 | 1321 | ||
1322 | /* we only need to suspend if we are a valid card */ | ||
1323 | if (!codec->card) | ||
1324 | return 0; | ||
1325 | |||
1326 | wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF); | 1322 | wm8990_set_bias_level(codec, SND_SOC_BIAS_OFF); |
1327 | return 0; | 1323 | return 0; |
1328 | } | 1324 | } |
@@ -1335,10 +1331,6 @@ static int wm8990_resume(struct platform_device *pdev) | |||
1335 | u8 data[2]; | 1331 | u8 data[2]; |
1336 | u16 *cache = codec->reg_cache; | 1332 | u16 *cache = codec->reg_cache; |
1337 | 1333 | ||
1338 | /* we only need to resume if we are a valid card */ | ||
1339 | if (!codec->card) | ||
1340 | return 0; | ||
1341 | |||
1342 | /* Sync reg_cache with the hardware */ | 1334 | /* Sync reg_cache with the hardware */ |
1343 | for (i = 0; i < ARRAY_SIZE(wm8990_reg); i++) { | 1335 | for (i = 0; i < ARRAY_SIZE(wm8990_reg); i++) { |
1344 | if (i + 1 == WM8990_RESET) | 1336 | if (i + 1 == WM8990_RESET) |