diff options
| author | Takashi Iwai | 2015-01-30 20:16:37 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-02-02 21:02:42 +0100 |
| commit | d29697dc3b92cb12a80632a5ade4fa26fd98225e (patch) | |
| tree | 1e829f0bacff5d5f2130ed13731f91e60f683c6b /sound/soc/soc-dapm.c | |
| parent | Linux 3.19-rc1 (diff) | |
| download | kernel-qcow2-linux-d29697dc3b92cb12a80632a5ade4fa26fd98225e.tar.gz kernel-qcow2-linux-d29697dc3b92cb12a80632a5ade4fa26fd98225e.tar.xz kernel-qcow2-linux-d29697dc3b92cb12a80632a5ade4fa26fd98225e.zip | |
ASoC: Add sysfs entries via static attribute groups
Instead of calling device_create_file() manually, assign the static
attribute group entries at the device registration. This simplifies
the error handling and avoids the possible races.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
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 c5136bb1f982..6c5cf7d1ff54 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) { @@ -3903,7 +3898,6 @@ void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card) */ 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); |