diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-11 16:51:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-11 16:51:31 +0000 |
| commit | 65ec1cd1e2c6228752d2f167b01e6d291014d249 (patch) | |
| tree | 8a54ef7d2a0d4770b49779114f9e1ac654363bdd /sound/soc/codecs/ak4104.c | |
| parent | 5314adc3612d893c7cc526b3312d124805e45bc3 (diff) | |
| parent | 6335d05548eece40092000aa91b64a50310d69d5 (diff) | |
ASoC: Merge dai_ops factor out
Merge Eric Maio's patch to merge snd_soc_dai_ops out of line. Fixed
merge issues and updated drivers, plus an issue with the ops for the two
s3c2443 AC97 DAIs having been merged.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ak4104.c')
| -rw-r--r-- | sound/soc/codecs/ak4104.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/ak4104.c b/sound/soc/codecs/ak4104.c index 338381f4fe1e..4d47bc4f7428 100644 --- 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); } +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 = { @@ -187,10 +192,7 @@ struct snd_soc_dai ak4104_dai = { 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; |