Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

diff --combined sound/soc/soc-dapm.c
index 0c19f84e661ad95fa6b585468f11d3cd97ea9527,0be3ca52eff325cdfd698e0f631bc524ef023c2e..ff0bce1a2d2cc8629636f8593b5e919c6adc6203
--- 1/sound/soc/soc-dapm.c
--- 2/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@@ -517,8 -517,8 +517,8 @@@ static int soc_dapm_update_bits(struct 
  {
        if (!dapm->component)
                return -EIO;
-       return snd_soc_component_update_bits_async(dapm->component, reg,
-               mask, value);
+       return snd_soc_component_update_bits(dapm->component, reg,
+                                            mask, value);
  }
  
  static int soc_dapm_test_bits(struct snd_soc_dapm_context *dapm,
@@@ -2127,10 -2127,15 +2127,10 @@@ static ssize_t dapm_widget_show(struct 
  
  static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL);
  
 -int snd_soc_dapm_sys_add(struct device *dev)
 -{
 -      return device_create_file(dev, &dev_attr_dapm_widget);
 -}
 -
 -static void snd_soc_dapm_sys_remove(struct device *dev)
 -{
 -      device_remove_file(dev, &dev_attr_dapm_widget);
 -}
 +struct attribute *soc_dapm_dev_attrs[] = {
 +      &dev_attr_dapm_widget.attr,
 +      NULL
 +};
  
  static void dapm_free_path(struct snd_soc_dapm_path *path)
  {
@@@ -3825,6 -3830,7 +3825,6 @@@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_s
   */
  void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm)
  {
 -      snd_soc_dapm_sys_remove(dapm->dev);
        dapm_debugfs_cleanup(dapm);
        dapm_free_widgets(dapm);
        list_del(&dapm->list);