lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Merge dai_ops factor out

Browse Source 
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>
This commit is contained in:
Mark Brown
2009-03-11 16:51:31 +00:00
parent 5314adc361 6335d05548
commit 65ec1cd1e2
42 changed files with 495 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/ak4104.c
View File

@ -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;