diff options
Diffstat (limited to 'sound/soc/au1x')
-rw-r--r-- | sound/soc/au1x/psc-ac97.c | 5 | ||||
-rw-r--r-- | sound/soc/au1x/psc-i2s.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 57facbad6825..ad60a6042cad 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c | |||
@@ -160,7 +160,8 @@ struct snd_ac97_bus_ops soc_ac97_ops = { | |||
160 | EXPORT_SYMBOL_GPL(soc_ac97_ops); | 160 | EXPORT_SYMBOL_GPL(soc_ac97_ops); |
161 | 161 | ||
162 | static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream, | 162 | static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream, |
163 | struct snd_pcm_hw_params *params) | 163 | struct snd_pcm_hw_params *params, |
164 | struct snd_soc_dai *dai) | ||
164 | { | 165 | { |
165 | /* FIXME */ | 166 | /* FIXME */ |
166 | struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata; | 167 | struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata; |
@@ -210,7 +211,7 @@ static int au1xpsc_ac97_hw_params(struct snd_pcm_substream *substream, | |||
210 | } | 211 | } |
211 | 212 | ||
212 | static int au1xpsc_ac97_trigger(struct snd_pcm_substream *substream, | 213 | static int au1xpsc_ac97_trigger(struct snd_pcm_substream *substream, |
213 | int cmd) | 214 | int cmd, struct snd_soc_dai *dai) |
214 | { | 215 | { |
215 | /* FIXME */ | 216 | /* FIXME */ |
216 | struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata; | 217 | struct au1xpsc_audio_data *pscdata = au1xpsc_ac97_workdata; |
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 9384702c7ebd..05a5acbb16ae 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c | |||
@@ -116,7 +116,8 @@ out: | |||
116 | } | 116 | } |
117 | 117 | ||
118 | static int au1xpsc_i2s_hw_params(struct snd_pcm_substream *substream, | 118 | static int au1xpsc_i2s_hw_params(struct snd_pcm_substream *substream, |
119 | struct snd_pcm_hw_params *params) | 119 | struct snd_pcm_hw_params *params, |
120 | struct snd_soc_dai *dai) | ||
120 | { | 121 | { |
121 | struct au1xpsc_audio_data *pscdata = au1xpsc_i2s_workdata; | 122 | struct au1xpsc_audio_data *pscdata = au1xpsc_i2s_workdata; |
122 | 123 | ||
@@ -240,7 +241,8 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype) | |||
240 | return 0; | 241 | return 0; |
241 | } | 242 | } |
242 | 243 | ||
243 | static int au1xpsc_i2s_trigger(struct snd_pcm_substream *substream, int cmd) | 244 | static int au1xpsc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, |
245 | struct snd_soc_dai *dai) | ||
244 | { | 246 | { |
245 | struct au1xpsc_audio_data *pscdata = au1xpsc_i2s_workdata; | 247 | struct au1xpsc_audio_data *pscdata = au1xpsc_i2s_workdata; |
246 | int ret, stype = SUBSTREAM_TYPE(substream); | 248 | int ret, stype = SUBSTREAM_TYPE(substream); |
@@ -389,8 +391,6 @@ struct snd_soc_dai au1xpsc_i2s_dai = { | |||
389 | .ops = { | 391 | .ops = { |
390 | .trigger = au1xpsc_i2s_trigger, | 392 | .trigger = au1xpsc_i2s_trigger, |
391 | .hw_params = au1xpsc_i2s_hw_params, | 393 | .hw_params = au1xpsc_i2s_hw_params, |
392 | }, | ||
393 | .dai_ops = { | ||
394 | .set_fmt = au1xpsc_i2s_set_fmt, | 394 | .set_fmt = au1xpsc_i2s_set_fmt, |
395 | }, | 395 | }, |
396 | }; | 396 | }; |