12 files changed, 68 insertions, 147 deletions

diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index e00421c0d8b..960fd797038 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -135,7 +135,6 @@ void snd_hda_detach_beep_device(struct hda_codec *codec)
         struct hda_beep *beep = codec->beep;
         if (beep) {
                 cancel_work_sync(&beep->beep_work);
-                flush_scheduled_work();
 
                 input_unregister_device(beep->dev);
                 kfree(beep);
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index e16cf63821a..3c596da2b9b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -373,7 +373,7 @@ int snd_hda_queue_unsol_event(struct hda_bus *bus, u32 res, u32 res_ex)
         unsol->queue[wp] = res;
         unsol->queue[wp + 1] = res_ex;
 
-        schedule_work(&unsol->work);
+        queue_work(bus->workq, &unsol->work);
 
         return 0;
 }
@@ -437,15 +437,17 @@ static int snd_hda_bus_free(struct hda_bus *bus)
 
         if (!bus)
                 return 0;
-        if (bus->unsol) {
-                flush_scheduled_work();
+        if (bus->workq)
+                flush_workqueue(bus->workq);
+        if (bus->unsol)
                 kfree(bus->unsol);
-        }
         list_for_each_entry_safe(codec, n, &bus->codec_list, list) {
                 snd_hda_codec_free(codec);
         }
         if (bus->ops.private_free)
                 bus->ops.private_free(bus);
+        if (bus->workq)
+                destroy_workqueue(bus->workq);
         kfree(bus);
         return 0;
 }
@@ -485,6 +487,7 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
 {
         struct hda_bus *bus;
         int err;
+        char qname[8];
         static struct snd_device_ops dev_ops = {
                 .dev_register = snd_hda_bus_dev_register,
                 .dev_free = snd_hda_bus_dev_free,
@@ -514,6 +517,14 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
         mutex_init(&bus->cmd_mutex);
         INIT_LIST_HEAD(&bus->codec_list);
 
+        snprintf(qname, sizeof(qname), "hda%d", card->number);
+        bus->workq = create_workqueue(qname);
+        if (!bus->workq) {
+                snd_printk(KERN_ERR "cannot create workqueue %s\n", qname);
+                kfree(bus);
+                return -ENOMEM;
+        }
+
         err = snd_device_new(card, SNDRV_DEV_BUS, bus, &dev_ops);
         if (err < 0) {
                 snd_hda_bus_free(bus);
@@ -684,7 +695,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
                 return;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
-        flush_scheduled_work();
+        flush_workqueue(codec->bus->workq);
 #endif
         list_del(&codec->list);
         snd_array_free(&codec->mixers);
@@ -735,6 +746,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
         codec->bus = bus;
         codec->addr = codec_addr;
         mutex_init(&codec->spdif_mutex);
+        mutex_init(&codec->control_mutex);
         init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
         init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
         snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
@@ -1272,7 +1284,7 @@ void snd_hda_codec_reset(struct hda_codec *codec)
 
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         cancel_delayed_work(&codec->power_work);
-        flush_scheduled_work();
+        flush_workqueue(codec->bus->workq);
 #endif
         snd_hda_ctls_clear(codec);
         /* relase PCMs */
@@ -1418,12 +1430,12 @@ int snd_hda_mixer_bind_switch_get(struct snd_kcontrol *kcontrol,
         unsigned long pval;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         pval = kcontrol->private_value;
         kcontrol->private_value = pval & ~AMP_VAL_IDX_MASK; /* index 0 */
         err = snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);
         kcontrol->private_value = pval;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_get);
@@ -1435,7 +1447,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
         unsigned long pval;
         int i, indices, err = 0, change = 0;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         pval = kcontrol->private_value;
         indices = (pval & AMP_VAL_IDX_MASK) >> AMP_VAL_IDX_SHIFT;
         for (i = 0; i < indices; i++) {
@@ -1447,7 +1459,7 @@ int snd_hda_mixer_bind_switch_put(struct snd_kcontrol *kcontrol,
                 change |= err;
         }
         kcontrol->private_value = pval;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err < 0 ? err : change;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_switch_put);
@@ -1462,12 +1474,12 @@ int snd_hda_mixer_bind_ctls_info(struct snd_kcontrol *kcontrol,
         struct hda_bind_ctls *c;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->info(kcontrol, uinfo);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_info);
@@ -1479,12 +1491,12 @@ int snd_hda_mixer_bind_ctls_get(struct snd_kcontrol *kcontrol,
         struct hda_bind_ctls *c;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->get(kcontrol, ucontrol);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_get);
@@ -1497,7 +1509,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
         unsigned long *vals;
         int err = 0, change = 0;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         for (vals = c->values; *vals; vals++) {
                 kcontrol->private_value = *vals;
@@ -1507,7 +1519,7 @@ int snd_hda_mixer_bind_ctls_put(struct snd_kcontrol *kcontrol,
                 change |= err;
         }
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err < 0 ? err : change;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_ctls_put);
@@ -1519,12 +1531,12 @@ int snd_hda_mixer_bind_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         struct hda_bind_ctls *c;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         c = (struct hda_bind_ctls *)kcontrol->private_value;
         kcontrol->private_value = *c->values;
         err = c->ops->tlv(kcontrol, op_flag, size, tlv);
         kcontrol->private_value = (long)c;
-        mutex_unlock(&codec->spdif_mutex);
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 EXPORT_SYMBOL_HDA(snd_hda_mixer_bind_tlv);
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 729fc7642d7..5810ef58840 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -614,6 +614,7 @@ struct hda_bus {
 
         /* unsolicited event queue */
         struct hda_bus_unsolicited *unsol;
+        struct workqueue_struct *workq; /* common workqueue for codecs */
 
         /* assigned PCMs */
         DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
@@ -771,6 +772,7 @@ struct hda_codec {
         struct hda_cache_rec cmd_cache; /* cache for other commands */
 
         struct mutex spdif_mutex;
+        struct mutex control_mutex;
         unsigned int spdif_status;      /* IEC958 status bits */
         unsigned short spdif_ctls;      /* SPDIF control bits */
         unsigned int spdif_in_enable;   /* SPDIF input enable? */
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index f04de115ee1..11e791b965f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -996,10 +996,11 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
                                 spin_unlock(&chip->reg_lock);
                                 snd_pcm_period_elapsed(azx_dev->substream);
                                 spin_lock(&chip->reg_lock);
-                        } else {
+                        } else if (chip->bus && chip->bus->workq) {
                                 /* bogus IRQ, process it later */
                                 azx_dev->irq_pending = 1;
-                                schedule_work(&chip->irq_pending_work);
+                                queue_work(chip->bus->workq,
+                                           &chip->irq_pending_work);
                         }
                 }
         }
@@ -1741,7 +1742,6 @@ static void azx_clear_irq_pending(struct azx *chip)
         for (i = 0; i < chip->num_streams; i++)
                 chip->azx_dev[i].irq_pending = 0;
         spin_unlock_irq(&chip->reg_lock);
-        flush_scheduled_work();
 }
 
 static struct snd_pcm_ops azx_pcm_ops = {
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 26247cfe749..2e7371ec2e2 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -3900,6 +3900,7 @@ static const char *ad1884a_models[AD1884A_MODELS] = {
 
 static struct snd_pci_quirk ad1884a_cfg_tbl[] = {
         SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE),
+        SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE),
         SND_PCI_QUIRK(0x103c, 0x30e6, "HP 6730b", AD1884A_LAPTOP),
         SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP),
@@ -4262,13 +4263,13 @@ static int patch_ad1882(struct hda_codec *codec)
         spec->num_adc_nids = ARRAY_SIZE(ad1882_adc_nids);
         spec->adc_nids = ad1882_adc_nids;
         spec->capsrc_nids = ad1882_capsrc_nids;
-        if (codec->vendor_id == 0x11d1882)
+        if (codec->vendor_id == 0x11d41882)
                 spec->input_mux = &ad1882_capture_source;
         else
                 spec->input_mux = &ad1882a_capture_source;
         spec->num_mixers = 2;
         spec->mixers[0] = ad1882_base_mixers;
-        if (codec->vendor_id == 0x11d1882)
+        if (codec->vendor_id == 0x11d41882)
                 spec->mixers[1] = ad1882_loopback_mixers;
         else
                 spec->mixers[1] = ad1882a_loopback_mixers;
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
index 0270fda0bda..96952a37d88 100644
--- a/sound/pci/hda/patch_nvhdmi.c
+++ b/sound/pci/hda/patch_nvhdmi.c
@@ -162,12 +162,14 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
         { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi },
         { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi },
         { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi },
+        { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi },
         {} /* terminator */
 };
 
 MODULE_ALIAS("snd-hda-codec-id:10de0002");
 MODULE_ALIAS("snd-hda-codec-id:10de0007");
 MODULE_ALIAS("snd-hda-codec-id:10de0067");
+MODULE_ALIAS("snd-hda-codec-id:10de8001");
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Nvidia HDMI HD-audio codec");
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 9065ebf9c06..ea4c88fe05c 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1502,11 +1502,11 @@ static int alc_cap_vol_info(struct snd_kcontrol *kcontrol,
         struct alc_spec *spec = codec->spec;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
                                                       HDA_INPUT);
         err = snd_hda_mixer_amp_volume_info(kcontrol, uinfo);
-        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 
@@ -1517,11 +1517,11 @@ static int alc_cap_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
         struct alc_spec *spec = codec->spec;
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[0], 3, 0,
                                                       HDA_INPUT);
         err = snd_hda_mixer_amp_tlv(kcontrol, op_flag, size, tlv);
-        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 
@@ -1537,11 +1537,11 @@ static int alc_cap_getput_caller(struct snd_kcontrol *kcontrol,
         unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         int err;
 
-        mutex_lock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_lock(&codec->control_mutex);
         kcontrol->private_value = HDA_COMPOSE_AMP_VAL(spec->adc_nids[adc_idx],
                                                       3, 0, HDA_INPUT);
         err = func(kcontrol, ucontrol);
-        mutex_unlock(&codec->spdif_mutex); /* reuse spdif_mutex */
+        mutex_unlock(&codec->control_mutex);
         return err;
 }
 
@@ -8461,6 +8461,10 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE),
         SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G",
                 ALC888_ACER_ASPIRE_4930G),
+        SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G",
+                ALC888_ACER_ASPIRE_4930G),
+        SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
+                ALC888_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
         SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
         SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
@@ -8522,6 +8526,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
         SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),
         SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),
+        SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC883_3ST_6ch_INTEL),
         SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),
         {}
 };
@@ -11689,6 +11694,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x015b, "Acer Aspire One",
                                                 ALC268_ACER_ASPIRE_ONE),
         SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
+        SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
         SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
         SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
         SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index 74c823d60f9..bc8d654576c 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -187,7 +187,7 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd,
                                         au1x_pcm_dmatx_cb, (void *)pcd);
 
         if (!pcd->ddma_chan)
-                return -ENOMEM;;
+                return -ENOMEM;
 
         au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits);
         au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2);
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index fd0f338374a..ea370a4f86d 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -197,7 +197,7 @@ static const char *twl4030_earpiece_texts[] =
 static const unsigned int twl4030_earpiece_values[] =
                 {0x0, 0x1, 0x2, 0x4};
 
-static const struct soc_value_enum twl4030_earpiece_enum =
+static const struct soc_enum twl4030_earpiece_enum =
         SOC_VALUE_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, 0x7,
                         ARRAY_SIZE(twl4030_earpiece_texts),
                         twl4030_earpiece_texts,
@@ -213,7 +213,7 @@ static const char *twl4030_predrivel_texts[] =
 static const unsigned int twl4030_predrivel_values[] =
                 {0x0, 0x1, 0x2, 0x4};
 
-static const struct soc_value_enum twl4030_predrivel_enum =
+static const struct soc_enum twl4030_predrivel_enum =
         SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, 0x7,
                         ARRAY_SIZE(twl4030_predrivel_texts),
                         twl4030_predrivel_texts,
@@ -229,7 +229,7 @@ static const char *twl4030_predriver_texts[] =
 static const unsigned int twl4030_predriver_values[] =
                 {0x0, 0x1, 0x2, 0x4};
 
-static const struct soc_value_enum twl4030_predriver_enum =
+static const struct soc_enum twl4030_predriver_enum =
         SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, 0x7,
                         ARRAY_SIZE(twl4030_predriver_texts),
                         twl4030_predriver_texts,
@@ -317,7 +317,7 @@ static const char *twl4030_analoglmic_texts[] =
 static const unsigned int twl4030_analoglmic_values[] =
                 {0x0, 0x1, 0x2, 0x4, 0x8};
 
-static const struct soc_value_enum twl4030_analoglmic_enum =
+static const struct soc_enum twl4030_analoglmic_enum =
         SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf,
                         ARRAY_SIZE(twl4030_analoglmic_texts),
                         twl4030_analoglmic_texts,
@@ -333,7 +333,7 @@ static const char *twl4030_analogrmic_texts[] =
 static const unsigned int twl4030_analogrmic_values[] =
                 {0x0, 0x1, 0x4};
 
-static const struct soc_value_enum twl4030_analogrmic_enum =
+static const struct soc_enum twl4030_analogrmic_enum =
         SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5,
                         ARRAY_SIZE(twl4030_analogrmic_texts),
                         twl4030_analogrmic_texts,
@@ -1280,6 +1280,8 @@ static int twl4030_remove(struct platform_device *pdev)
         struct snd_soc_codec *codec = socdev->codec;
 
         printk(KERN_INFO "TWL4030 Audio Codec remove\n");
+        snd_soc_free_pcms(socdev);
+        snd_soc_dapm_free(socdev);
         kfree(codec);
 
         return 0;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 74abc9b4f1c..366049d8578 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -212,7 +212,7 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream)
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 count = src - runtime->dma_addr;
         else
-                count = dst - runtime->dma_addr;;
+                count = dst - runtime->dma_addr;
 
         spin_unlock(&prtd->lock);
 
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6cbe7e82f23..55fdb4abb17 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1585,37 +1585,6 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
 EXPORT_SYMBOL_GPL(snd_soc_put_enum_double);
 
 /**
- * snd_soc_info_value_enum_double - semi enumerated double mixer info callback
- * @kcontrol: mixer control
- * @uinfo: control element information
- *
- * Callback to provide information about a double semi enumerated
- * mixer control.
- *
- * Semi enumerated mixer: the enumerated items are referred as values. Can be
- * used for handling bitfield coded enumeration for example.
- *
- * Returns 0 for success.
- */
-int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo)
-{
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = e->shift_l == e->shift_r ? 1 : 2;
-        uinfo->value.enumerated.items = e->max;
-
-        if (uinfo->value.enumerated.item > e->max - 1)
-                uinfo->value.enumerated.item = e->max - 1;
-        strcpy(uinfo->value.enumerated.name,
-                e->texts[uinfo->value.enumerated.item]);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(snd_soc_info_value_enum_double);
-
-/**
  * snd_soc_get_value_enum_double - semi enumerated double mixer get callback
  * @kcontrol: mixer control
  * @ucontrol: control element information
@@ -1631,8 +1600,7 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short reg_val, val, mux;
 
         reg_val = snd_soc_read(codec, e->reg);
@@ -1671,8 +1639,7 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short val;
         unsigned short mask;
 
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index ad0d801677c..493a4e8aa27 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -137,7 +137,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         }
         break;
         case snd_soc_dapm_value_mux: {
-                struct soc_value_enum *e = (struct soc_value_enum *)
+                struct soc_enum *e = (struct soc_enum *)
                         w->kcontrols[i].private_value;
                 int val, item;
 
@@ -200,30 +200,6 @@ static int dapm_connect_mux(struct snd_soc_codec *codec,
         return -ENODEV;
 }
 
-/* connect value_mux widget to it's interconnecting audio paths */
-static int dapm_connect_value_mux(struct snd_soc_codec *codec,
-        struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
-        struct snd_soc_dapm_path *path, const char *control_name,
-        const struct snd_kcontrol_new *kcontrol)
-{
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
-        int i;
-
-        for (i = 0; i < e->max; i++) {
-                if (!(strcmp(control_name, e->texts[i]))) {
-                        list_add(&path->list, &codec->dapm_paths);
-                        list_add(&path->list_sink, &dest->sources);
-                        list_add(&path->list_source, &src->sinks);
-                        path->name = (char *)e->texts[i];
-                        dapm_set_path_status(dest, path, 0);
-                        return 0;
-                }
-        }
-
-        return -ENODEV;
-}
-
 /* connect mixer widget to it's interconnecting audio paths */
 static int dapm_connect_mixer(struct snd_soc_codec *codec,
         struct snd_soc_dapm_widget *src, struct snd_soc_dapm_widget *dest,
@@ -774,45 +750,6 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget,
         return 0;
 }
 
-/* test and update the power status of a value_mux widget */
-static int dapm_value_mux_update_power(struct snd_soc_dapm_widget *widget,
-                                 struct snd_kcontrol *kcontrol, int mask,
-                                 int mux, int val, struct soc_value_enum *e)
-{
-        struct snd_soc_dapm_path *path;
-        int found = 0;
-
-        if (widget->id != snd_soc_dapm_value_mux)
-                return -ENODEV;
-
-        if (!snd_soc_test_bits(widget->codec, e->reg, mask, val))
-                return 0;
-
-        /* find dapm widget path assoc with kcontrol */
-        list_for_each_entry(path, &widget->codec->dapm_paths, list) {
-                if (path->kcontrol != kcontrol)
-                        continue;
-
-                if (!path->name || !e->texts[mux])
-                        continue;
-
-                found = 1;
-                /* we now need to match the string in the enum to the path */
-                if (!(strcmp(path->name, e->texts[mux])))
-                        path->connect = 1; /* new connection */
-                else
-                        path->connect = 0; /* old connection must be
-                                              powered down */
-        }
-
-        if (found) {
-                dapm_power_widgets(widget->codec, SND_SOC_DAPM_STREAM_NOP);
-                dump_dapm(widget->codec, "mux power update");
-        }
-
-        return 0;
-}
-
 /* test and update the power status of a mixer or switch widget */
 static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget,
                                    struct snd_kcontrol *kcontrol, int reg,
@@ -1045,17 +982,12 @@ static int snd_soc_dapm_add_route(struct snd_soc_codec *codec,
                 path->connect = 1;
                 return 0;
         case snd_soc_dapm_mux:
+        case snd_soc_dapm_value_mux:
                 ret = dapm_connect_mux(codec, wsource, wsink, path, control,
                         &wsink->kcontrols[0]);
                 if (ret != 0)
                         goto err;
                 break;
-        case snd_soc_dapm_value_mux:
-                ret = dapm_connect_value_mux(codec, wsource, wsink, path,
-                        control, &wsink->kcontrols[0]);
-                if (ret != 0)
-                        goto err;
-                break;
         case snd_soc_dapm_switch:
         case snd_soc_dapm_mixer:
                 ret = dapm_connect_mixer(codec, wsource, wsink, path, control);
@@ -1382,8 +1314,7 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short reg_val, val, mux;
 
         reg_val = snd_soc_read(widget->codec, e->reg);
@@ -1423,8 +1354,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
-        struct soc_value_enum *e = (struct soc_value_enum *)
-                        kcontrol->private_value;
+        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short val, mux;
         unsigned short mask;
         int ret = 0;
@@ -1443,7 +1373,7 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
 
         mutex_lock(&widget->codec->mutex);
         widget->value = val;
-        dapm_value_mux_update_power(widget, kcontrol, mask, mux, val, e);
+        dapm_mux_update_power(widget, kcontrol, mask, mux, val, e);
         if (widget->event) {
                 if (widget->event_flags & SND_SOC_DAPM_PRE_REG) {
                         ret = widget->event(widget,