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>
This commit is contained in:
parent
97bf6af1f9
commit
d29697dc3b
|
@ -405,7 +405,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 */
|
||||
int snd_soc_dapm_sys_add(struct device *dev);
|
||||
extern struct attribute *soc_dapm_dev_attrs[];
|
||||
void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,
|
||||
struct dentry *parent);
|
||||
|
||||
|
|
|
@ -191,6 +191,39 @@ static ssize_t pmdown_time_set(struct device *dev,
|
|||
|
||||
static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set);
|
||||
|
||||
static struct attribute *soc_dev_attrs[] = {
|
||||
&dev_attr_codec_reg.attr,
|
||||
&dev_attr_pmdown_time.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int idx)
|
||||
{
|
||||
struct device *dev = kobj_to_dev(kobj);
|
||||
struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
|
||||
|
||||
if (attr == &dev_attr_pmdown_time.attr)
|
||||
return attr->mode; /* always visible */
|
||||
return rtd->codec ? attr->mode : 0; /* enabled only with codec */
|
||||
}
|
||||
|
||||
static const struct attribute_group soc_dapm_dev_group = {
|
||||
.attrs = soc_dapm_dev_attrs,
|
||||
.is_visible = soc_dev_attr_is_visible,
|
||||
};
|
||||
|
||||
static const struct attribute_group soc_dev_roup = {
|
||||
.attrs = soc_dev_attrs,
|
||||
.is_visible = soc_dev_attr_is_visible,
|
||||
};
|
||||
|
||||
static const struct attribute_group *soc_dev_attr_groups[] = {
|
||||
&soc_dapm_dev_group,
|
||||
&soc_dev_roup,
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
|
||||
size_t count, loff_t *ppos)
|
||||
|
@ -949,8 +982,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card, int num, int order)
|
|||
|
||||
/* unregister the rtd device */
|
||||
if (rtd->dev_registered) {
|
||||
device_remove_file(rtd->dev, &dev_attr_pmdown_time);
|
||||
device_remove_file(rtd->dev, &dev_attr_codec_reg);
|
||||
device_unregister(rtd->dev);
|
||||
rtd->dev_registered = 0;
|
||||
}
|
||||
|
@ -1120,6 +1151,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
|
|||
device_initialize(rtd->dev);
|
||||
rtd->dev->parent = rtd->card->dev;
|
||||
rtd->dev->release = rtd_release;
|
||||
rtd->dev->groups = soc_dev_attr_groups;
|
||||
dev_set_name(rtd->dev, "%s", name);
|
||||
dev_set_drvdata(rtd->dev, rtd);
|
||||
mutex_init(&rtd->pcm_mutex);
|
||||
|
@ -1136,23 +1168,6 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
|
|||
return ret;
|
||||
}
|
||||
rtd->dev_registered = 1;
|
||||
|
||||
if (rtd->codec) {
|
||||
/* add DAPM sysfs entries for this codec */
|
||||
ret = snd_soc_dapm_sys_add(rtd->dev);
|
||||
if (ret < 0)
|
||||
dev_err(rtd->dev,
|
||||
"ASoC: failed to add codec dapm sysfs entries: %d\n",
|
||||
ret);
|
||||
|
||||
/* add codec sysfs entries */
|
||||
ret = device_create_file(rtd->dev, &dev_attr_codec_reg);
|
||||
if (ret < 0)
|
||||
dev_err(rtd->dev,
|
||||
"ASoC: failed to add codec sysfs files: %d\n",
|
||||
ret);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1308,11 +1323,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
|
|||
}
|
||||
#endif
|
||||
|
||||
ret = device_create_file(rtd->dev, &dev_attr_pmdown_time);
|
||||
if (ret < 0)
|
||||
dev_warn(rtd->dev, "ASoC: failed to add pmdown_time sysfs: %d\n",
|
||||
ret);
|
||||
|
||||
if (cpu_dai->driver->compress_dai) {
|
||||
/*create compress_device"*/
|
||||
ret = soc_new_compress(rtd, num);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue