ASoC: Fix some missing dai_ops conversions
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Mar 2009 14:02:07 +0000 (14:02 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Mar 2009 14:13:57 +0000 (14:13 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/s3c24xx/s3c64xx-i2s.c
sound/soc/sh/hac.c

index 6e1e85dc1ff294b7f035ee6cece907790a987044..33c5de7e255f3769d00b6de48425085abc48dc56 100644 (file)
@@ -177,6 +177,10 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
 #define S3C64XX_I2S_FMTS \
        (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE)
 
+static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = {
+       .set_sysclk     = s3c64xx_i2s_set_sysclk,       
+};
+
 struct snd_soc_dai s3c64xx_i2s_dai = {
        .name           = "s3c64xx-i2s",
        .id             = 0,
@@ -193,9 +197,7 @@ struct snd_soc_dai s3c64xx_i2s_dai = {
                .rates          = S3C64XX_I2S_RATES,
                .formats        = S3C64XX_I2S_FMTS,
        },
-       .ops = {
-               .set_sysclk     = s3c64xx_i2s_set_sysclk,
-       },
+       .ops = &s3c64xx_i2s_dai_ops,
 };
 EXPORT_SYMBOL_GPL(s3c64xx_i2s_dai);
 
index eab31838badfed9515a93a97a8eb020d50e4688e..41db75af3c69d3b64f2420e07acfb2ca3473fa45 100644 (file)
@@ -267,6 +267,10 @@ static int hac_hw_params(struct snd_pcm_substream *substream,
 #define AC97_FMTS      \
        SNDRV_PCM_FMTBIT_S16_LE
 
+static struct snd_soc_dai_ops hac_dai_ops = {
+       .hw_params      = hac_hw_params,
+};
+
 struct snd_soc_dai sh4_hac_dai[] = {
 {
        .name                   = "HAC0",
@@ -284,9 +288,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
                .channels_min   = 2,
                .channels_max   = 2,
        },
-       .ops = {
-               .hw_params      = hac_hw_params,
-       },
+       .ops = &hac_dai_ops,
 },
 #ifdef CONFIG_CPU_SUBTYPE_SH7760
 {
@@ -305,9 +307,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
                .channels_min   = 2,
                .channels_max   = 2,
        },
-       .ops = {
-               .hw_params      = hac_hw_params,
-       },
+       .ops = &hac_dai_ops,
 
 },
 #endif