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/au1x | |
| parent | ASoC: TWL4030: Add helper function for output gain controls (diff) | |
| download | linux-dev-3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54.tar.xz linux-dev-3ba9e10a6d3b6abf5f5952572cff8f8d5a35ae54.zip | |
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/au1x')
| -rw-r--r-- | sound/soc/au1x/psc-ac97.c | 2 | ||||
| -rw-r--r-- | sound/soc/au1x/psc-i2s.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index ad60a6042cad..a0bcfeaf5f86 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -346,7 +346,7 @@ static int au1xpsc_ac97_resume(struct platform_device *pdev, struct snd_soc_dai au1xpsc_ac97_dai = { .name = "au1xpsc_ac97", - .type = SND_SOC_DAI_AC97, + .ac97_control = 1, .probe = au1xpsc_ac97_probe, .remove = au1xpsc_ac97_remove, .suspend = au1xpsc_ac97_suspend, diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 05a5acbb16ae..f4217e70a787 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -371,7 +371,6 @@ static int au1xpsc_i2s_resume(struct platform_device *pdev, struct snd_soc_dai au1xpsc_i2s_dai = { .name = "au1xpsc_i2s", - .type = SND_SOC_DAI_I2S, .probe = au1xpsc_i2s_probe, .remove = au1xpsc_i2s_remove, .suspend = au1xpsc_i2s_suspend, |