Skip to content

Commit 08dc0f5

Browse files
morimotobroonie
authored andcommitted
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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 9d33f9c commit 08dc0f5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/sound/soc-dapm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm,
685685
struct snd_soc_dapm_update *update);
686686

687687
/* dapm sys fs - used by the core */
688-
extern struct attribute *soc_dapm_dev_attrs[];
688+
extern struct attribute *snd_soc_dapm_dev_attrs[];
689689
void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent);
690690

691691
/* dapm audio pin control and status */

sound/soc/soc-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
112112
}
113113

114114
static const struct attribute_group soc_dapm_dev_group = {
115-
.attrs = soc_dapm_dev_attrs,
115+
.attrs = snd_soc_dapm_dev_attrs,
116116
.is_visible = soc_dev_attr_is_visible,
117117
};
118118

sound/soc/soc-dapm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2715,7 +2715,7 @@ static ssize_t dapm_widget_show(struct device *dev,
27152715

27162716
static DEVICE_ATTR_RO(dapm_widget);
27172717

2718-
struct attribute *soc_dapm_dev_attrs[] = {
2718+
struct attribute *snd_soc_dapm_dev_attrs[] = {
27192719
&dev_attr_dapm_widget.attr,
27202720
NULL
27212721
};

0 commit comments

Comments
 (0)