aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8988.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-13 12:39:56 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-15 10:01:43 -0400
commitd2058b0cd039aad89b111d83b9c347e9d8f57a84 (patch)
tree6bd622cf1ba7518a2e01cab18302b8bdea8b727c /sound/soc/codecs/wm8988.c
parented9d040d40942e9c48167f9f37f86fab8e0e5e17 (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/wm8988.c')
-rw-r--r--sound/soc/codecs/wm8988.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 3f530f8a972a..d8d8f68b81ea 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -944,21 +944,6 @@ static int wm8988_i2c_remove(struct i2c_client *client)
944 return 0; 944 return 0;
945} 945}
946 946
947#ifdef CONFIG_PM
948static int wm8988_i2c_suspend(struct i2c_client *client, pm_message_t msg)
949{
950 return snd_soc_suspend_device(&client->dev);
951}
952
953static int wm8988_i2c_resume(struct i2c_client *client)
954{
955 return snd_soc_resume_device(&client->dev);
956}
957#else
958#define wm8988_i2c_suspend NULL
959#define wm8988_i2c_resume NULL
960#endif
961
962static const struct i2c_device_id wm8988_i2c_id[] = { 947static const struct i2c_device_id wm8988_i2c_id[] = {
963 { "wm8988", 0 }, 948 { "wm8988", 0 },
964 { } 949 { }
@@ -972,8 +957,6 @@ static struct i2c_driver wm8988_i2c_driver = {
972 }, 957 },
973 .probe = wm8988_i2c_probe, 958 .probe = wm8988_i2c_probe,
974 .remove = wm8988_i2c_remove, 959 .remove = wm8988_i2c_remove,
975 .suspend = wm8988_i2c_suspend,
976 .resume = wm8988_i2c_resume,
977 .id_table = wm8988_i2c_id, 960 .id_table = wm8988_i2c_id,
978}; 961};
979#endif 962#endif
@@ -1006,21 +989,6 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi)
1006 return 0; 989 return 0;
1007} 990}
1008 991
1009#ifdef CONFIG_PM
1010static int wm8988_spi_suspend(struct spi_device *spi, pm_message_t msg)
1011{
1012 return snd_soc_suspend_device(&spi->dev);
1013}
1014
1015static int wm8988_spi_resume(struct spi_device *spi)
1016{
1017 return snd_soc_resume_device(&spi->dev);
1018}
1019#else
1020#define wm8988_spi_suspend NULL
1021#define wm8988_spi_resume NULL
1022#endif
1023
1024static struct spi_driver wm8988_spi_driver = { 992static struct spi_driver wm8988_spi_driver = {
1025 .driver = { 993 .driver = {
1026 .name = "wm8988", 994 .name = "wm8988",
@@ -1029,8 +997,6 @@ static struct spi_driver wm8988_spi_driver = {
1029 }, 997 },
1030 .probe = wm8988_spi_probe, 998 .probe = wm8988_spi_probe,
1031 .remove = __devexit_p(wm8988_spi_remove), 999 .remove = __devexit_p(wm8988_spi_remove),
1032 .suspend = wm8988_spi_suspend,
1033 .resume = wm8988_spi_resume,
1034}; 1000};
1035#endif 1001#endif
1036 1002