Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/topology', ...

diff --combined sound/soc/soc-topology.c
index 8419edb9d8f94fb17af64782e11c024760099f76,65670b2b408cca0d4bffb2931cb7443cd4ba75b1,585b88b45f7bc0052f984ef78feafb504cf95db5,65670b2b408cca0d4bffb2931cb7443cd4ba75b1,65670b2b408cca0d4bffb2931cb7443cd4ba75b1,65670b2b408cca0d4bffb2931cb7443cd4ba75b1..aff3d8129ac965376deea8618ae81727db41cbfa
--- 1/sound/soc/soc-topology.c
--- 2/sound/soc/soc-topology.c
--- 3/sound/soc/soc-topology.c
--- 4/sound/soc/soc-topology.c
--- 5/sound/soc/soc-topology.c
--- 6/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@@@@@@ -514,12 -514,13 -514,13 -514,13 -514,13 -514,13 +514,12 @@@@@@@ static void remove_widget(struct snd_so
                            == SND_SOC_TPLG_TYPE_MIXER)
                                kfree(kcontrol->tlv.p);
      
 -----                  snd_ctl_remove(card, kcontrol);
 -----
                        /* Private value is used as struct soc_mixer_control
                         * for volume mixers or soc_bytes_ext for bytes
                         * controls.
                         */
                        kfree((void *)kcontrol->private_value);
 +++++                  snd_ctl_remove(card, kcontrol);
                }
                kfree(w->kcontrol_news);
        }
@@@@@@@ -1555,15 -1556,6 -1556,6 -1556,6 -1556,6 -1556,6 +1555,15 @@@@@@@ widget
                widget = snd_soc_dapm_new_control(dapm, &template);
        else
                widget = snd_soc_dapm_new_control_unlocked(dapm, &template);
 +++++  if (IS_ERR(widget)) {
 +++++          ret = PTR_ERR(widget);
 +++++          /* Do not nag about probe deferrals */
 +++++          if (ret != -EPROBE_DEFER)
 +++++                  dev_err(tplg->dev,
 +++++                          "ASoC: failed to create widget %s controls (%d)\n",
 +++++                          w->name, ret);
 +++++          goto hdr_err;
 +++++  }
        if (widget == NULL) {
                dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n",
                        w->name);
@@@@@@@ -1871,7 -1863,7 -1863,7 -1863,7 -1863,7 -1863,7 +1871,7 @@@@@@@ static int soc_tplg_pcm_elems_load(stru
      {
        struct snd_soc_tplg_pcm *pcm, *_pcm;
        int count = hdr->count;
-- ---  int i, err;
++ +++  int i;
        bool abi_match;
      
        if (tplg->pass != SOC_TPLG_PASS_PCM_DAI)
@@@@@@@ -1905,7 -1897,7 -1897,7 -1897,7 -1897,7 -1897,7 +1905,7 @@@@@@@
                        _pcm = pcm;
                } else {
                        abi_match = false;
-- ---                  err = pcm_new_ver(tplg, pcm, &_pcm);
++ +++                  pcm_new_ver(tplg, pcm, &_pcm);
                }
      
                /* create the FE DAIs and DAI links */
@@@@@@@ -1927,7 -1919,7 -1919,7 -1919,7 -1919,7 -1919,7 +1927,7 @@@@@@@
      
      /**
       * set_link_hw_format - Set the HW audio format of the physical DAI link.
 ----- * @tplg: topology context
 +++++ * @link: &snd_soc_dai_link which should be updated
       * @cfg: physical link configs.
       *
       * Topology context contains a list of supported HW formats (configs) and
@@@@@@@ -1978,7 -1970,7 -1970,7 -1970,7 -1970,7 -1970,7 +1978,7 @@@@@@@ static void set_link_hw_format(struct s
      /**
       * link_new_ver - Create a new physical link config from the old
       * version of source.
 ----- * @toplogy: topology context
 +++++ * @tplg: topology context
       * @src: old version of phyical link config as a source
       * @link: latest version of physical link config created from the source
       *
@@@@@@@ -2220,7 -2212,7 -2212,7 -2212,7 -2212,7 -2212,7 +2220,7 @@@@@@@ static int soc_tplg_dai_elems_load(stru
      /**
       * manifest_new_ver - Create a new version of manifest from the old version
       * of source.
 ----- * @toplogy: topology context
 +++++ * @tplg: topology context
       * @src: old version of manifest as a source
       * @manifest: latest version of manifest created from the source
       *