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/wm8900.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/wm8900.c')
-rw-r--r-- | sound/soc/codecs/wm8900.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 882604ef768c..b48804b5cacd 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -1312,21 +1312,6 @@ static __devexit int wm8900_i2c_remove(struct i2c_client *client) | |||
1312 | return 0; | 1312 | return 0; |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | #ifdef CONFIG_PM | ||
1316 | static int wm8900_i2c_suspend(struct i2c_client *client, pm_message_t msg) | ||
1317 | { | ||
1318 | return snd_soc_suspend_device(&client->dev); | ||
1319 | } | ||
1320 | |||
1321 | static int wm8900_i2c_resume(struct i2c_client *client) | ||
1322 | { | ||
1323 | return snd_soc_resume_device(&client->dev); | ||
1324 | } | ||
1325 | #else | ||
1326 | #define wm8900_i2c_suspend NULL | ||
1327 | #define wm8900_i2c_resume NULL | ||
1328 | #endif | ||
1329 | |||
1330 | static const struct i2c_device_id wm8900_i2c_id[] = { | 1315 | static const struct i2c_device_id wm8900_i2c_id[] = { |
1331 | { "wm8900", 0 }, | 1316 | { "wm8900", 0 }, |
1332 | { } | 1317 | { } |
@@ -1340,8 +1325,6 @@ static struct i2c_driver wm8900_i2c_driver = { | |||
1340 | }, | 1325 | }, |
1341 | .probe = wm8900_i2c_probe, | 1326 | .probe = wm8900_i2c_probe, |
1342 | .remove = __devexit_p(wm8900_i2c_remove), | 1327 | .remove = __devexit_p(wm8900_i2c_remove), |
1343 | .suspend = wm8900_i2c_suspend, | ||
1344 | .resume = wm8900_i2c_resume, | ||
1345 | .id_table = wm8900_i2c_id, | 1328 | .id_table = wm8900_i2c_id, |
1346 | }; | 1329 | }; |
1347 | 1330 | ||