diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-13 12:39:56 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-15 10:01:43 -0400 |
commit | d2058b0cd039aad89b111d83b9c347e9d8f57a84 (patch) | |
tree | 6bd622cf1ba7518a2e01cab18302b8bdea8b727c /sound/soc/codecs/wm8580.c | |
parent | ed9d040d40942e9c48167f9f37f86fab8e0e5e17 (diff) |
ASoC: Remove snd_soc_suspend_device()
The PM core will grow pm_link infrastructure in 2.6.33 which can be
used to implement the intended functionality of the ASoC-specific
device suspend and resume callbacks so drop them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
-rw-r--r-- | sound/soc/codecs/wm8580.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 3be5c0b2552c..a09b23e03664 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -961,21 +961,6 @@ static int wm8580_i2c_remove(struct i2c_client *client) | |||
961 | return 0; | 961 | return 0; |
962 | } | 962 | } |
963 | 963 | ||
964 | #ifdef CONFIG_PM | ||
965 | static int wm8580_i2c_suspend(struct i2c_client *client, pm_message_t msg) | ||
966 | { | ||
967 | return snd_soc_suspend_device(&client->dev); | ||
968 | } | ||
969 | |||
970 | static int wm8580_i2c_resume(struct i2c_client *client) | ||
971 | { | ||
972 | return snd_soc_resume_device(&client->dev); | ||
973 | } | ||
974 | #else | ||
975 | #define wm8580_i2c_suspend NULL | ||
976 | #define wm8580_i2c_resume NULL | ||
977 | #endif | ||
978 | |||
979 | static const struct i2c_device_id wm8580_i2c_id[] = { | 964 | static const struct i2c_device_id wm8580_i2c_id[] = { |
980 | { "wm8580", 0 }, | 965 | { "wm8580", 0 }, |
981 | { } | 966 | { } |
@@ -989,8 +974,6 @@ static struct i2c_driver wm8580_i2c_driver = { | |||
989 | }, | 974 | }, |
990 | .probe = wm8580_i2c_probe, | 975 | .probe = wm8580_i2c_probe, |
991 | .remove = wm8580_i2c_remove, | 976 | .remove = wm8580_i2c_remove, |
992 | .suspend = wm8580_i2c_suspend, | ||
993 | .resume = wm8580_i2c_resume, | ||
994 | .id_table = wm8580_i2c_id, | 977 | .id_table = wm8580_i2c_id, |
995 | }; | 978 | }; |
996 | #endif | 979 | #endif |