diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:00 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:00 +0800 |
| commit | afcfe4359e32f4fe1588b1d60414aacce676e27a (patch) | |
| tree | 246377b48e8cbe7f87087b5fb1f1276cc17d5e61 /sound/soc/soc-dapm.c | |
| parent | 0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65 (diff) | |
| parent | 8f6f9b2982b2c924fe2dde816e2decb3ca1d8f8f (diff) | |
| download | op-kernel-dev-afcfe4359e32f4fe1588b1d60414aacce676e27a.zip op-kernel-dev-afcfe4359e32f4fe1588b1d60414aacce676e27a.tar.gz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ea49684..0c19f84e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2127,15 +2127,10 @@ static ssize_t dapm_widget_show(struct device *dev, 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) { @@ -3830,7 +3825,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend); */ 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); |
