22 files changed, 20 insertions, 54 deletions

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 916f73b9a18f..0bb18dfa9495 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -702,7 +702,6 @@ static int atmel_ssc_resume(struct platform_device *pdev,
 struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
         {       .name = "atmel-ssc0",
                 .id = 0,
-                .type = SND_SOC_DAI_PCM,
                 .suspend = atmel_ssc_suspend,
                 .resume = atmel_ssc_resume,
                 .playback = {
@@ -727,7 +726,6 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
 #if NUM_SSC_DEVICES == 3
         {       .name = "atmel-ssc1",
                 .id = 1,
-                .type = SND_SOC_DAI_PCM,
                 .suspend = atmel_ssc_suspend,
                 .resume = atmel_ssc_resume,
                 .playback = {
@@ -751,7 +749,6 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {
         },
         {       .name = "atmel-ssc2",
                 .id = 2,
-                .type = SND_SOC_DAI_PCM,
                 .suspend = atmel_ssc_suspend,
                 .resume = atmel_ssc_resume,
                 .playback = {
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,
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c
index 5dcd3f665ab1..709bdf08e398 100644
--- a/sound/soc/blackfin/bf5xx-ac97.c
+++ b/sound/soc/blackfin/bf5xx-ac97.c
@@ -409,7 +409,7 @@ static void bf5xx_ac97_remove(struct platform_device *pdev,
 struct snd_soc_dai bfin_ac97_dai = {
         .name = "bf5xx-ac97",
         .id = 0,
-        .type = SND_SOC_DAI_AC97,
+        .ac97_control = 1,
         .probe = bf5xx_ac97_probe,
         .remove = bf5xx_ac97_remove,
         .suspend = bf5xx_ac97_suspend,
diff --git a/sound/soc/blackfin/bf5xx-i2s.c b/sound/soc/blackfin/bf5xx-i2s.c
index 4e675b55b182..6e5036bf9245 100644
--- a/sound/soc/blackfin/bf5xx-i2s.c
+++ b/sound/soc/blackfin/bf5xx-i2s.c
@@ -292,7 +292,6 @@ static int bf5xx_i2s_resume(struct platform_device *pdev,
 struct snd_soc_dai bf5xx_i2s_dai = {
         .name = "bf5xx-i2s",
         .id = 0,
-        .type = SND_SOC_DAI_I2S,
         .probe = bf5xx_i2s_probe,
         .remove = bf5xx_i2s_remove,
         .suspend = bf5xx_i2s_suspend,
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 8a93aff359d0..c4208c8210c8 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -43,7 +43,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream,
 
 struct snd_soc_dai ac97_dai = {
         .name = "AC97 HiFi",
-        .type = SND_SOC_DAI_AC97,
+        .ac97_control = 1,
         .playback = {
                 .stream_name = "AC97 Playback",
                 .channels_min = 1,
diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 2b26e1d80c8d..651a15eb8c2c 100644
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -33,7 +33,6 @@
 
 struct snd_soc_dai pcm3008_dai = {
         .name = "PCM3008 HiFi",
-        .type = SND_SOC_DAI_I2S,
         .playback = {
                 .stream_name = "PCM3008 Playback",
                 .channels_min = 1,
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 6e3e0f340179..40f14061fb72 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -535,7 +535,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream,
 struct snd_soc_dai wm9712_dai[] = {
 {
         .name = "AC97 HiFi",
-        .type = SND_SOC_DAI_AC97_BUS,
+        .ac97_control = 1,
         .playback = {
                 .stream_name = "HiFi Playback",
                 .channels_min = 1,
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index a502667fca7a..9dad0bffcb05 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1024,7 +1024,7 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream,
 struct snd_soc_dai wm9713_dai[] = {
 {
         .name = "AC97 HiFi",
-        .type = SND_SOC_DAI_AC97_BUS,
+        .ac97_control = 1,
         .playback = {
                 .stream_name = "HiFi Playback",
                 .channels_min = 1,
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 7a17cd0ecf64..cf31b3bb96cf 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -460,7 +460,6 @@ static void davinci_i2s_remove(struct platform_device *pdev,
 struct snd_soc_dai davinci_i2s_dai = {
         .name = "davinci-i2s",
         .id = 0,
-        .type = SND_SOC_DAI_I2S,
         .probe = davinci_i2s_probe,
         .remove = davinci_i2s_remove,
         .playback = {
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index e2c172f38979..9ad8f9a2d8e9 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -469,7 +469,6 @@ static int psc_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
  * psc_i2s_dai_template: template CPU Digital Audio Interface
  */
 static struct snd_soc_dai psc_i2s_dai_template = {
-        .type = SND_SOC_DAI_I2S,
         .playback = {
                 .channels_min = 2,
                 .channels_max = 2,
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 2eeb135c1e4b..252bc7ebb194 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -456,7 +456,6 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
 {                                                               \
         .name = "omap-mcbsp-dai-"#link_id,                      \
         .id = (link_id),                                        \
-        .type = SND_SOC_DAI_I2S,                                \
         .playback = {                                           \
                 .channels_min = 2,                              \
                 .channels_max = 2,                              \
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 = {
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 528fc3f1b45b..3df2224a6723 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -548,7 +548,6 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
 static struct snd_soc_dai bt_dai = {
         .name = "Bluetooth",
         .id = 0,
-        .type = SND_SOC_DAI_PCM,
         .playback = {
                 .channels_min = 1,
                 .channels_max = 1,
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c
index 360cc2a49d9d..1c741047ae35 100644
--- a/sound/soc/s3c24xx/s3c2412-i2s.c
+++ b/sound/soc/s3c24xx/s3c2412-i2s.c
@@ -713,7 +713,6 @@ static int s3c2412_i2s_resume(struct platform_device *pdev,
 struct snd_soc_dai s3c2412_i2s_dai = {
         .name   = "s3c2412-i2s",
         .id     = 0,
-        .type   = SND_SOC_DAI_I2S,
         .probe  = s3c2412_i2s_probe,
         .suspend = s3c2412_i2s_suspend,
         .resume = s3c2412_i2s_resume,
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c
index 31377821b2c5..41bde6a3883b 100644
--- a/sound/soc/s3c24xx/s3c2443-ac97.c
+++ b/sound/soc/s3c24xx/s3c2443-ac97.c
@@ -358,7 +358,7 @@ struct snd_soc_dai s3c2443_ac97_dai[] = {
 {
         .name = "s3c2443-ac97",
         .id = 0,
-        .type = SND_SOC_DAI_AC97,
+        .ac97_control = 1,
         .probe = s3c2443_ac97_probe,
         .remove = s3c2443_ac97_remove,
         .playback = {
@@ -380,7 +380,7 @@ struct snd_soc_dai s3c2443_ac97_dai[] = {
 {
         .name = "pxa2xx-ac97-mic",
         .id = 1,
-        .type = SND_SOC_DAI_AC97,
+        .ac97_control = 1,
         .capture = {
                 .stream_name = "AC97 Mic Capture",
                 .channels_min = 1,
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index 1bac9dd3dbd4..8d9135f41bc9 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -461,7 +461,6 @@ static int s3c24xx_i2s_resume(struct platform_device *pdev,
 struct snd_soc_dai s3c24xx_i2s_dai = {
         .name = "s3c24xx-i2s",
         .id = 0,
-        .type = SND_SOC_DAI_I2S,
         .probe = s3c24xx_i2s_probe,
         .suspend = s3c24xx_i2s_suspend,
         .resume = s3c24xx_i2s_resume,
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c
index 3318071dc80f..c435913c60eb 100644
--- a/sound/soc/sh/hac.c
+++ b/sound/soc/sh/hac.c
@@ -271,7 +271,7 @@ struct snd_soc_dai sh4_hac_dai[] = {
 {
         .name                   = "HAC0",
         .id                     = 0,
-        .type                   = SND_SOC_DAI_AC97,
+        .ac97_control           = 1,
         .playback = {
                 .rates          = AC97_RATES,
                 .formats        = AC97_FMTS,
@@ -291,8 +291,8 @@ struct snd_soc_dai sh4_hac_dai[] = {
 #ifdef CONFIG_CPU_SUBTYPE_SH7760
 {
         .name                   = "HAC1",
+        .ac97_control           = 1,
         .id                     = 1,
-        .type                   = SND_SOC_DAI_AC97,
         .playback = {
                 .rates          = AC97_RATES,
                 .formats        = AC97_FMTS,
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index 52a233840d27..fed544a3deff 100644
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -340,7 +340,6 @@ struct snd_soc_dai sh4_ssi_dai[] = {
 {
         .name                   = "SSI0",
         .id                     = 0,
-        .type                   = SND_SOC_DAI_I2S,
         .playback = {
                 .rates          = SSI_RATES,
                 .formats        = SSI_FMTS,
@@ -367,7 +366,6 @@ struct snd_soc_dai sh4_ssi_dai[] = {
 {
         .name                   = "SSI1",
         .id                     = 1,
-        .type                   = SND_SOC_DAI_I2S,
         .playback = {
                 .rates          = SSI_RATES,
                 .formats        = SSI_FMTS,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 43f4060dbe75..0d47696ccd07 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -100,20 +100,6 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec)
 }
 #endif
 
-static inline const char *get_dai_name(int type)
-{
-        switch (type) {
-        case SND_SOC_DAI_AC97_BUS:
-        case SND_SOC_DAI_AC97:
-                return "AC97";
-        case SND_SOC_DAI_I2S:
-                return "I2S";
-        case SND_SOC_DAI_PCM:
-                return "PCM";
-        }
-        return NULL;
-}
-
 /*
  * Called by ALSA when a PCM substream is opened, the runtime->hw record is
  * then initialized and any private data can be allocated. This also calls
@@ -652,7 +638,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
 
         for (i = 0; i < card->num_links; i++) {
                 struct snd_soc_dai  *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->suspend && cpu_dai->type != SND_SOC_DAI_AC97)
+                if (cpu_dai->suspend && !cpu_dai->ac97_control)
                         cpu_dai->suspend(pdev, cpu_dai);
                 if (platform->suspend)
                         platform->suspend(pdev, cpu_dai);
@@ -678,7 +664,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
 
         for (i = 0; i < card->num_links; i++) {
                 struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->suspend && cpu_dai->type == SND_SOC_DAI_AC97)
+                if (cpu_dai->suspend && cpu_dai->ac97_control)
                         cpu_dai->suspend(pdev, cpu_dai);
         }
 
@@ -714,7 +700,7 @@ static void soc_resume_deferred(struct work_struct *work)
 
         for (i = 0; i < card->num_links; i++) {
                 struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->resume && cpu_dai->type == SND_SOC_DAI_AC97)
+                if (cpu_dai->resume && cpu_dai->ac97_control)
                         cpu_dai->resume(pdev, cpu_dai);
         }
 
@@ -741,7 +727,7 @@ static void soc_resume_deferred(struct work_struct *work)
 
         for (i = 0; i < card->num_links; i++) {
                 struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
-                if (cpu_dai->resume && cpu_dai->type != SND_SOC_DAI_AC97)
+                if (cpu_dai->resume && !cpu_dai->ac97_control)
                         cpu_dai->resume(pdev, cpu_dai);
                 if (platform->resume)
                         platform->resume(pdev, cpu_dai);
@@ -898,8 +884,8 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
         codec_dai->codec = socdev->codec;
 
         /* check client and interface hw capabilities */
-        sprintf(new_name, "%s %s-%s-%d", dai_link->stream_name, codec_dai->name,
-                get_dai_name(cpu_dai->type), num);
+        sprintf(new_name, "%s %s-%d", dai_link->stream_name, codec_dai->name,
+                num);
 
         if (codec_dai->playback.channels_min)
                 playback = 1;
@@ -1270,8 +1256,7 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
                                 continue;
                         }
                 }
-                if (card->dai_link[i].codec_dai->type ==
-                        SND_SOC_DAI_AC97_BUS)
+                if (card->dai_link[i].codec_dai->ac97_control)
                         ac97 = 1;
         }
         snprintf(codec->card->shortname, sizeof(codec->card->shortname),
@@ -1335,7 +1320,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev)
 #ifdef CONFIG_SND_SOC_AC97_BUS
         for (i = 0; i < codec->num_dai; i++) {
                 codec_dai = &codec->dai[i];
-                if (codec_dai->type == SND_SOC_DAI_AC97_BUS && codec->ac97) {
+                if (codec_dai->ac97_control && codec->ac97) {
                         soc_ac97_dev_unregister(codec);
                         goto free_card;
                 }