diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-11-24 18:01:05 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-11-24 18:01:31 +0000 |
commit | 3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54 (patch) | |
tree | 855569d0aeee6fc06a35928f3b6e351918c9bea6 /sound/soc/pxa/pxa2xx-ac97.c | |
parent | b0bd53a7399f65e2d1b37cd44c5003e55b886c1e (diff) | |
download | kernel_samsung_smdk4412-3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54.zip kernel_samsung_smdk4412-3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54.tar.gz kernel_samsung_smdk4412-3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54.tar.bz2 |
ASoC: Remove DAI type information
DAI type information is only ever used within ASoC in order to special
case AC97 and for diagnostic purposes. Since modern CPUs and codecs
support multi function DAIs which can be configured for several modes
it is more trouble than it's worth to maintain anything other than a
flag identifying AC97 DAIs so remove the type field and replace it with
an ac97_control flag.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/pxa2xx-ac97.c')
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 86667d2..bffbe28 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -173,7 +173,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { { .name = "pxa2xx-ac97", .id = 0, - .type = SND_SOC_DAI_AC97, + .ac97_control = 1, .probe = pxa2xx_ac97_probe, .remove = pxa2xx_ac97_remove, .suspend = pxa2xx_ac97_suspend, @@ -196,7 +196,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { { .name = "pxa2xx-ac97-aux", .id = 1, - .type = SND_SOC_DAI_AC97, + .ac97_control = 1, .playback = { .stream_name = "AC97 Aux Playback", .channels_min = 1, @@ -215,7 +215,7 @@ struct snd_soc_dai pxa_ac97_dai[] = { { .name = "pxa2xx-ac97-mic", .id = 2, - .type = SND_SOC_DAI_AC97, + .ac97_control = 1, .capture = { .stream_name = "AC97 Mic Capture", .channels_min = 1, |