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/cs4270.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/cs4270.c')
-rw-r--r-- | sound/soc/codecs/cs4270.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index ca1e24a8f12a..59bb16d033d6 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -802,22 +802,6 @@ MODULE_DEVICE_TABLE(i2c, cs4270_id); | |||
802 | * and all registers are written back to the hardware when resuming. | 802 | * and all registers are written back to the hardware when resuming. |
803 | */ | 803 | */ |
804 | 804 | ||
805 | static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg) | ||
806 | { | ||
807 | struct cs4270_private *cs4270 = i2c_get_clientdata(client); | ||
808 | struct snd_soc_codec *codec = &cs4270->codec; | ||
809 | |||
810 | return snd_soc_suspend_device(codec->dev); | ||
811 | } | ||
812 | |||
813 | static int cs4270_i2c_resume(struct i2c_client *client) | ||
814 | { | ||
815 | struct cs4270_private *cs4270 = i2c_get_clientdata(client); | ||
816 | struct snd_soc_codec *codec = &cs4270->codec; | ||
817 | |||
818 | return snd_soc_resume_device(codec->dev); | ||
819 | } | ||
820 | |||
821 | static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg) | 805 | static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg) |
822 | { | 806 | { |
823 | struct snd_soc_codec *codec = cs4270_codec; | 807 | struct snd_soc_codec *codec = cs4270_codec; |
@@ -853,8 +837,6 @@ static int cs4270_soc_resume(struct platform_device *pdev) | |||
853 | return snd_soc_write(codec, CS4270_PWRCTL, reg); | 837 | return snd_soc_write(codec, CS4270_PWRCTL, reg); |
854 | } | 838 | } |
855 | #else | 839 | #else |
856 | #define cs4270_i2c_suspend NULL | ||
857 | #define cs4270_i2c_resume NULL | ||
858 | #define cs4270_soc_suspend NULL | 840 | #define cs4270_soc_suspend NULL |
859 | #define cs4270_soc_resume NULL | 841 | #define cs4270_soc_resume NULL |
860 | #endif /* CONFIG_PM */ | 842 | #endif /* CONFIG_PM */ |
@@ -873,8 +855,6 @@ static struct i2c_driver cs4270_i2c_driver = { | |||
873 | .id_table = cs4270_id, | 855 | .id_table = cs4270_id, |
874 | .probe = cs4270_i2c_probe, | 856 | .probe = cs4270_i2c_probe, |
875 | .remove = cs4270_i2c_remove, | 857 | .remove = cs4270_i2c_remove, |
876 | .suspend = cs4270_i2c_suspend, | ||
877 | .resume = cs4270_i2c_resume, | ||
878 | }; | 858 | }; |
879 | 859 | ||
880 | /* | 860 | /* |