ASoC: soc-dapm: add prefix on soc_dapm_dev_attrs

soc_dapm_dev_attrs is global variable. Let's add snd_soc_ prefix.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87ikkchis6.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index be5ecc276562c05a3dae4667960c66a5bb71bb9b..0b5c7e6a90c81482b078112965bf6d4b296243e7 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -685,7 +685,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm,
                struct snd_soc_dapm_update *update);
 
 /* dapm sys fs - used by the core */
-extern struct attribute *soc_dapm_dev_attrs[];
+extern struct attribute *snd_soc_dapm_dev_attrs[];
 void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent);
 
 /* dapm audio pin control and status */

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b59f612de4e5acb2153f32149ec2bd48d59c8b3c..ebe94956df44bb45a38a90bf0108f270afc80373 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -112,7 +112,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
 }
 
 static const struct attribute_group soc_dapm_dev_group = {
-       .attrs = soc_dapm_dev_attrs,
+       .attrs = snd_soc_dapm_dev_attrs,
        .is_visible = soc_dev_attr_is_visible,
 };
 

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index e8bd83fb9ef49f43898a4360d666e78ac6152072..b8a5875378c87d7cc930e771a5a4a5267bc133f8 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2715,7 +2715,7 @@ static ssize_t dapm_widget_show(struct device *dev,
 
 static DEVICE_ATTR_RO(dapm_widget);
 
-struct attribute *soc_dapm_dev_attrs[] = {
+struct attribute *snd_soc_dapm_dev_attrs[] = {
        &dev_attr_dapm_widget.attr,
        NULL
 };