Commit f2a5d6a2ea2fa24573a8ce7ea7a7a2cce42e3588
1 parent
10d9e3d99e
Exists in
master
and in
7 other branches
ASoC: Fix some missing dai_ops conversions
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Showing 2 changed files with 11 additions and 9 deletions Side-by-side Diff
sound/soc/s3c24xx/s3c64xx-i2s.c
| ... | ... | @@ -177,6 +177,10 @@ |
| 177 | 177 | #define S3C64XX_I2S_FMTS \ |
| 178 | 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 | 184 | struct snd_soc_dai s3c64xx_i2s_dai = { |
| 181 | 185 | .name = "s3c64xx-i2s", |
| 182 | 186 | .id = 0, |
| ... | ... | @@ -193,9 +197,7 @@ |
| 193 | 197 | .rates = S3C64XX_I2S_RATES, |
| 194 | 198 | .formats = S3C64XX_I2S_FMTS, |
| 195 | 199 | }, |
| 196 | - .ops = { | |
| 197 | - .set_sysclk = s3c64xx_i2s_set_sysclk, | |
| 198 | - }, | |
| 200 | + .ops = &s3c64xx_i2s_dai_ops, | |
| 199 | 201 | }; |
| 200 | 202 | EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai); |
| 201 | 203 |
sound/soc/sh/hac.c
| ... | ... | @@ -267,6 +267,10 @@ |
| 267 | 267 | #define AC97_FMTS \ |
| 268 | 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 | 274 | struct snd_soc_dai sh4_hac_dai[] = { |
| 271 | 275 | { |
| 272 | 276 | .name = "HAC0", |
| ... | ... | @@ -284,9 +288,7 @@ |
| 284 | 288 | .channels_min = 2, |
| 285 | 289 | .channels_max = 2, |
| 286 | 290 | }, |
| 287 | - .ops = { | |
| 288 | - .hw_params = hac_hw_params, | |
| 289 | - }, | |
| 291 | + .ops = &hac_dai_ops, | |
| 290 | 292 | }, |
| 291 | 293 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 |
| 292 | 294 | { |
| ... | ... | @@ -305,9 +307,7 @@ |
| 305 | 307 | .channels_min = 2, |
| 306 | 308 | .channels_max = 2, |
| 307 | 309 | }, |
| 308 | - .ops = { | |
| 309 | - .hw_params = hac_hw_params, | |
| 310 | - }, | |
| 310 | + .ops = &hac_dai_ops, | |
| 311 | 311 | |
| 312 | 312 | }, |
| 313 | 313 | #endif |