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>

3 files changed, 3 insertions, 8 deletions

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index d0dd6245a20a..402fc5ba65e7 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -788,7 +788,6 @@ struct snd_soc_dai pxa_ssp_dai[] = {
         {
                 .name = "pxa2xx-ssp1",
                 .id = 0,
-                .type = SND_SOC_DAI_PCM,
                 .probe = pxa_ssp_probe,
                 .remove = pxa_ssp_remove,
                 .suspend = pxa_ssp_suspend,
@@ -820,7 +819,6 @@ struct snd_soc_dai pxa_ssp_dai[] = {
         },
         {       .name = "pxa2xx-ssp2",
                 .id = 1,
-                .type = SND_SOC_DAI_PCM,
                 .probe = pxa_ssp_probe,
                 .remove = pxa_ssp_remove,
                 .suspend = pxa_ssp_suspend,
@@ -853,7 +851,6 @@ struct snd_soc_dai pxa_ssp_dai[] = {
         {
                 .name = "pxa2xx-ssp3",
                 .id = 2,
-                .type = SND_SOC_DAI_PCM,
                 .probe = pxa_ssp_probe,
                 .remove = pxa_ssp_remove,
                 .suspend = pxa_ssp_suspend,
@@ -886,7 +883,6 @@ struct snd_soc_dai pxa_ssp_dai[] = {
         {
                 .name = "pxa2xx-ssp4",
                 .id = 3,
-                .type = SND_SOC_DAI_PCM,
                 .probe = pxa_ssp_probe,
                 .remove = pxa_ssp_remove,
                 .suspend = pxa_ssp_suspend,
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 86667d2f1b75..bffbe288634c 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,
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 9a3e55b48129..f9a9e2ebafa1 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -340,7 +340,6 @@ static int pxa2xx_i2s_resume(struct platform_device *pdev,
 struct snd_soc_dai pxa_i2s_dai = {
         .name = "pxa2xx-i2s",
         .id = 0,
-        .type = SND_SOC_DAI_I2S,
         .suspend = pxa2xx_i2s_suspend,
         .resume = pxa2xx_i2s_resume,
         .playback = {