diff options
Diffstat (limited to 'sound/soc/codecs/uda134x.c')
-rw-r--r-- | sound/soc/codecs/uda134x.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c index 69ef521a2ed1..91f333cdc7cf 100644 --- a/sound/soc/codecs/uda134x.c +++ b/sound/soc/codecs/uda134x.c | |||
@@ -168,7 +168,8 @@ static int uda134x_mute(struct snd_soc_dai *dai, int mute) | |||
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | 170 | ||
171 | static int uda134x_startup(struct snd_pcm_substream *substream) | 171 | static int uda134x_startup(struct snd_pcm_substream *substream, |
172 | struct snd_soc_dai *dai) | ||
172 | { | 173 | { |
173 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 174 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
174 | struct snd_soc_device *socdev = rtd->socdev; | 175 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -200,7 +201,8 @@ static int uda134x_startup(struct snd_pcm_substream *substream) | |||
200 | return 0; | 201 | return 0; |
201 | } | 202 | } |
202 | 203 | ||
203 | static void uda134x_shutdown(struct snd_pcm_substream *substream) | 204 | static void uda134x_shutdown(struct snd_pcm_substream *substream, |
205 | struct snd_soc_dai *dai) | ||
204 | { | 206 | { |
205 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 207 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
206 | struct snd_soc_device *socdev = rtd->socdev; | 208 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -214,7 +216,8 @@ static void uda134x_shutdown(struct snd_pcm_substream *substream) | |||
214 | } | 216 | } |
215 | 217 | ||
216 | static int uda134x_hw_params(struct snd_pcm_substream *substream, | 218 | static int uda134x_hw_params(struct snd_pcm_substream *substream, |
217 | struct snd_pcm_hw_params *params) | 219 | struct snd_pcm_hw_params *params, |
220 | struct snd_soc_dai *dai) | ||
218 | { | 221 | { |
219 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 222 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
220 | struct snd_soc_device *socdev = rtd->socdev; | 223 | struct snd_soc_device *socdev = rtd->socdev; |
@@ -484,9 +487,6 @@ struct snd_soc_dai uda134x_dai = { | |||
484 | .startup = uda134x_startup, | 487 | .startup = uda134x_startup, |
485 | .shutdown = uda134x_shutdown, | 488 | .shutdown = uda134x_shutdown, |
486 | .hw_params = uda134x_hw_params, | 489 | .hw_params = uda134x_hw_params, |
487 | }, | ||
488 | /* DAI operations */ | ||
489 | .dai_ops = { | ||
490 | .digital_mute = uda134x_mute, | 490 | .digital_mute = uda134x_mute, |
491 | .set_sysclk = uda134x_set_dai_sysclk, | 491 | .set_sysclk = uda134x_set_dai_sysclk, |
492 | .set_fmt = uda134x_set_dai_fmt, | 492 | .set_fmt = uda134x_set_dai_fmt, |