aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8961.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/wm8961.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/wm8961.c')
-rw-r--r--sound/soc/codecs/wm8961.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index 503032085899..b5c6f2cd5ae2 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -1206,21 +1206,6 @@ static __devexit int wm8961_i2c_remove(struct i2c_client *client)
1206 return 0; 1206 return 0;
1207} 1207}
1208 1208
1209#ifdef CONFIG_PM
1210static int wm8961_i2c_suspend(struct i2c_client *client, pm_message_t state)
1211{
1212 return snd_soc_suspend_device(&client->dev);
1213}
1214
1215static int wm8961_i2c_resume(struct i2c_client *client)
1216{
1217 return snd_soc_resume_device(&client->dev);
1218}
1219#else
1220#define wm8961_i2c_suspend NULL
1221#define wm8961_i2c_resume NULL
1222#endif
1223
1224static const struct i2c_device_id wm8961_i2c_id[] = { 1209static const struct i2c_device_id wm8961_i2c_id[] = {
1225 { "wm8961", 0 }, 1210 { "wm8961", 0 },
1226 { } 1211 { }
@@ -1234,8 +1219,6 @@ static struct i2c_driver wm8961_i2c_driver = {
1234 }, 1219 },
1235 .probe = wm8961_i2c_probe, 1220 .probe = wm8961_i2c_probe,
1236 .remove = __devexit_p(wm8961_i2c_remove), 1221 .remove = __devexit_p(wm8961_i2c_remove),
1237 .suspend = wm8961_i2c_suspend,
1238 .resume = wm8961_i2c_resume,
1239 .id_table = wm8961_i2c_id, 1222 .id_table = wm8961_i2c_id,
1240}; 1223};
1241 1224