Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

ASoC: Final updates for v3.15 merge window

A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.

diff --combined sound/soc/soc-core.c
index b65ca10ca0d42d258cc563d88a2ba402e3911b90,caebd63531125924179c083f396a6114ba82c916..051c006281f5c2c003583f7104c9ec02dc886dfc
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1253,7 -1253,7 +1253,7 @@@ static int soc_post_component_init(stru
        struct snd_soc_dai_link *dai_link = NULL;
        struct snd_soc_aux_dev *aux_dev = NULL;
        struct snd_soc_pcm_runtime *rtd;
-       const char *temp, *name;
+       const char *name;
        int ret = 0;
  
        if (!dailess) {
@@@ -1267,10 -1267,6 +1267,6 @@@
        }
        rtd->card = card;
  
-       /* machine controls, routes and widgets are not prefixed */
-       temp = codec->name_prefix;
-       codec->name_prefix = NULL;
- 
        /* do machine specific initialization */
        if (!dailess && dai_link->init)
                ret = dai_link->init(rtd);
@@@ -1280,7 -1276,6 +1276,6 @@@
                dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret);
                return ret;
        }
-       codec->name_prefix = temp;
  
        /* register the rtd device */
        rtd->codec = codec;
@@@ -1661,7 -1656,7 +1656,7 @@@ static int snd_soc_instantiate_card(str
        }
  
        /* card bind complete so register a sound card */
 -      ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
 +      ret = snd_card_new(card->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
                        card->owner, 0, &card->snd_card);
        if (ret < 0) {
                dev_err(card->dev,
@@@ -1669,6 -1664,7 +1664,6 @@@
                        card->name, ret);
                goto base_error;
        }
 -      card->snd_card->dev = card->dev;
  
        card->dapm.bias_level = SND_SOC_BIAS_OFF;
        card->dapm.dev = card->dev;
@@@ -3624,14 -3620,14 +3619,14 @@@ int snd_soc_dai_set_fmt(struct snd_soc_
  EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt);
  
  /**
-  * snd_soc_of_xlate_tdm_slot - generate tx/rx slot mask.
+  * snd_soc_xlate_tdm_slot - generate tx/rx slot mask.
   * @slots: Number of slots in use.
   * @tx_mask: bitmask representing active TX slots.
   * @rx_mask: bitmask representing active RX slots.
   *
   * Generates the TDM tx and rx slot default masks for DAI.
   */
- static int snd_soc_of_xlate_tdm_slot_mask(unsigned int slots,
+ static int snd_soc_xlate_tdm_slot_mask(unsigned int slots,
                                          unsigned int *tx_mask,
                                          unsigned int *rx_mask)
  {
@@@ -3661,11 -3657,11 +3656,11 @@@
  int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai,
        unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
  {
-       if (dai->driver && dai->driver->ops->of_xlate_tdm_slot_mask)
-               dai->driver->ops->of_xlate_tdm_slot_mask(slots,
+       if (dai->driver && dai->driver->ops->xlate_tdm_slot_mask)
+               dai->driver->ops->xlate_tdm_slot_mask(slots,
                                                &tx_mask, &rx_mask);
        else
-               snd_soc_of_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask);
+               snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask);
  
        if (dai->driver && dai->driver->ops->set_tdm_slot)
                return dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask,