ASoC: Merge dai_ops factor out

[pandora-kernel.git] / sound / soc / codecs / ak4104.c

diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c
index 338381f..4d47bc4 100644 (file)
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
@@ -174,6 +174,11 @@ static int ak4104_hw_params(struct snd_pcm_substream *substream,
        return ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(3), val);
 }
 
        return ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(3), val);
 }
 

+static struct snd_soc_dai_ops ak4101_dai_ops = {
+       .hw_params = ak4104_hw_params,
+       .set_fmt = ak4104_set_dai_fmt,
+};
+

 struct snd_soc_dai ak4104_dai = {
        .name = DRV_NAME,
        .playback = {
 struct snd_soc_dai ak4104_dai = {
        .name = DRV_NAME,
        .playback = {


@@ -187,10 +192,7 @@ struct snd_soc_dai ak4104_dai = {
                           SNDRV_PCM_FMTBIT_S24_3LE |
                           SNDRV_PCM_FMTBIT_S24_LE
        },
                           SNDRV_PCM_FMTBIT_S24_3LE |
                           SNDRV_PCM_FMTBIT_S24_LE
        },

-       .ops = {
-               .hw_params = ak4104_hw_params,
-               .set_fmt = ak4104_set_dai_fmt,
-       }
+       .ops = &ak4101_dai_ops,

 };
 
 static struct snd_soc_codec *ak4104_codec;
 };
 
 static struct snd_soc_codec *ak4104_codec;