diff options
Diffstat (limited to 'sound/soc/pxa/raumfeld.c')
-rw-r--r-- | sound/soc/pxa/raumfeld.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index 0fd60f423036..2afabaf59491 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c | |||
@@ -151,13 +151,13 @@ static struct snd_soc_ops raumfeld_cs4270_ops = { | |||
151 | .hw_params = raumfeld_cs4270_hw_params, | 151 | .hw_params = raumfeld_cs4270_hw_params, |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static int raumfeld_line_suspend(struct platform_device *pdev, pm_message_t state) | 154 | static int raumfeld_line_suspend(struct snd_soc_card *card) |
155 | { | 155 | { |
156 | raumfeld_enable_audio(false); | 156 | raumfeld_enable_audio(false); |
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |
159 | 159 | ||
160 | static int raumfeld_line_resume(struct platform_device *pdev) | 160 | static int raumfeld_line_resume(struct snd_soc_card *card) |
161 | { | 161 | { |
162 | raumfeld_enable_audio(true); | 162 | raumfeld_enable_audio(true); |
163 | return 0; | 163 | return 0; |
@@ -229,19 +229,19 @@ static struct snd_soc_dai_link raumfeld_dai[] = { | |||
229 | { | 229 | { |
230 | .name = "ak4104", | 230 | .name = "ak4104", |
231 | .stream_name = "Playback", | 231 | .stream_name = "Playback", |
232 | .cpu_dai_name = "pxa-ssp-dai.1", | 232 | .cpu_dai_name = "pxa-ssp-dai.1", |
233 | .codec_dai_name = "ak4104-hifi", | 233 | .codec_dai_name = "ak4104-hifi", |
234 | .platform_name = "pxa-pcm-audio", | 234 | .platform_name = "pxa-pcm-audio", |
235 | .ops = &raumfeld_ak4104_ops, | 235 | .ops = &raumfeld_ak4104_ops, |
236 | .codec_name = "ak4104-codec.0", | 236 | .codec_name = "ak4104-codec.0", |
237 | }, | 237 | }, |
238 | { | 238 | { |
239 | .name = "CS4270", | 239 | .name = "CS4270", |
240 | .stream_name = "CS4270", | 240 | .stream_name = "CS4270", |
241 | .cpu_dai_name = "pxa-ssp-dai.0", | 241 | .cpu_dai_name = "pxa-ssp-dai.0", |
242 | .platform_name = "pxa-pcm-audio", | 242 | .platform_name = "pxa-pcm-audio", |
243 | .codec_dai_name = "cs4270-hifi", | 243 | .codec_dai_name = "cs4270-hifi", |
244 | .codec_name = "cs4270-codec.0-0048", | 244 | .codec_name = "cs4270-codec.0-0048", |
245 | .ops = &raumfeld_cs4270_ops, | 245 | .ops = &raumfeld_cs4270_ops, |
246 | },}; | 246 | },}; |
247 | 247 | ||