diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-16 10:02:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-16 10:13:57 -0400 |
commit | f2a5d6a2ea2fa24573a8ce7ea7a7a2cce42e3588 (patch) | |
tree | 0719eee496f2edec29573181203887dd391c5a3d | |
parent | 10d9e3d99ee8332bb73a3d7f12a8cd8ffab8b136 (diff) |
ASoC: Fix some missing dai_ops conversions
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 8 | ||||
-rw-r--r-- | sound/soc/sh/hac.c | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 6e1e85dc1ff2..33c5de7e255f 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
@@ -177,6 +177,10 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev, | |||
177 | #define S3C64XX_I2S_FMTS \ | 177 | #define S3C64XX_I2S_FMTS \ |
178 | (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE) | 178 | (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE) |
179 | 179 | ||
180 | static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = { | ||
181 | .set_sysclk = s3c64xx_i2s_set_sysclk, | ||
182 | }; | ||
183 | |||
180 | struct snd_soc_dai s3c64xx_i2s_dai = { | 184 | struct snd_soc_dai s3c64xx_i2s_dai = { |
181 | .name = "s3c64xx-i2s", | 185 | .name = "s3c64xx-i2s", |
182 | .id = 0, | 186 | .id = 0, |
@@ -193,9 +197,7 @@ struct snd_soc_dai s3c64xx_i2s_dai = { | |||
193 | .rates = S3C64XX_I2S_RATES, | 197 | .rates = S3C64XX_I2S_RATES, |
194 | .formats = S3C64XX_I2S_FMTS, | 198 | .formats = S3C64XX_I2S_FMTS, |
195 | }, | 199 | }, |
196 | .ops = { | 200 | .ops = &s3c64xx_i2s_dai_ops, |
197 | .set_sysclk = s3c64xx_i2s_set_sysclk, | ||
198 | }, | ||
199 | }; | 201 | }; |
200 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai); | 202 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai); |
201 | 203 | ||
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index eab31838badf..41db75af3c69 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c | |||
@@ -267,6 +267,10 @@ static int hac_hw_params(struct snd_pcm_substream *substream, | |||
267 | #define AC97_FMTS \ | 267 | #define AC97_FMTS \ |
268 | SNDRV_PCM_FMTBIT_S16_LE | 268 | SNDRV_PCM_FMTBIT_S16_LE |
269 | 269 | ||
270 | static struct snd_soc_dai_ops hac_dai_ops = { | ||
271 | .hw_params = hac_hw_params, | ||
272 | }; | ||
273 | |||
270 | struct snd_soc_dai sh4_hac_dai[] = { | 274 | struct snd_soc_dai sh4_hac_dai[] = { |
271 | { | 275 | { |
272 | .name = "HAC0", | 276 | .name = "HAC0", |
@@ -284,9 +288,7 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
284 | .channels_min = 2, | 288 | .channels_min = 2, |
285 | .channels_max = 2, | 289 | .channels_max = 2, |
286 | }, | 290 | }, |
287 | .ops = { | 291 | .ops = &hac_dai_ops, |
288 | .hw_params = hac_hw_params, | ||
289 | }, | ||
290 | }, | 292 | }, |
291 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 | 293 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 |
292 | { | 294 | { |
@@ -305,9 +307,7 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
305 | .channels_min = 2, | 307 | .channels_min = 2, |
306 | .channels_max = 2, | 308 | .channels_max = 2, |
307 | }, | 309 | }, |
308 | .ops = { | 310 | .ops = &hac_dai_ops, |
309 | .hw_params = hac_hw_params, | ||
310 | }, | ||
311 | 311 | ||
312 | }, | 312 | }, |
313 | #endif | 313 | #endif |