diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-16 12:53:16 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-18 10:53:15 -0400 |
commit | aef908434cd24dd5529065bf5d781773fad21125 (patch) | |
tree | d78b8f1644d77bb3c81cd24ed3ed4dc91598695f | |
parent | 6d3ddc81f5762d54ce7d1db70eb757c6c12fabbc (diff) |
ASoC: Make DAPM sysfs entries non-optional
sysfs is so standard these days there's no point.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/soc-dapm.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 04ef84106d7c..d130602b3072 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -67,10 +67,6 @@ static int dapm_down_seq[] = { | |||
67 | snd_soc_dapm_post | 67 | snd_soc_dapm_post |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static int dapm_status = 1; | ||
71 | module_param(dapm_status, int, 0); | ||
72 | MODULE_PARM_DESC(dapm_status, "enable DPM sysfs entries"); | ||
73 | |||
74 | static void pop_wait(u32 pop_time) | 70 | static void pop_wait(u32 pop_time) |
75 | { | 71 | { |
76 | if (pop_time) | 72 | if (pop_time) |
@@ -974,16 +970,12 @@ static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); | |||
974 | 970 | ||
975 | int snd_soc_dapm_sys_add(struct device *dev) | 971 | int snd_soc_dapm_sys_add(struct device *dev) |
976 | { | 972 | { |
977 | if (!dapm_status) | ||
978 | return 0; | ||
979 | return device_create_file(dev, &dev_attr_dapm_widget); | 973 | return device_create_file(dev, &dev_attr_dapm_widget); |
980 | } | 974 | } |
981 | 975 | ||
982 | static void snd_soc_dapm_sys_remove(struct device *dev) | 976 | static void snd_soc_dapm_sys_remove(struct device *dev) |
983 | { | 977 | { |
984 | if (dapm_status) { | 978 | device_remove_file(dev, &dev_attr_dapm_widget); |
985 | device_remove_file(dev, &dev_attr_dapm_widget); | ||
986 | } | ||
987 | } | 979 | } |
988 | 980 | ||
989 | /* free all dapm widgets and resources */ | 981 | /* free all dapm widgets and resources */ |