evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iio:trigger: Register sysfs file statically

Browse source 
The name sysfs attribute is the same for all triggers, so there is no need to
register them dynamically at runtime. Create a attribute group for it and set it
up for the bus attribute group. This also avoids a possible race condition
where the uevent for the device is sent before the name sysfs attribute has been
added.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2012-07-05 10:57:06 +02:00 • committed by Jonathan Cameron
parent cf09fe9c87
commit 6d459aa011
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/iio/industrialio-trigger.c
View file

@ -51,25 +51,19 @@ static ssize_t iio_trigger_read_name(struct device *dev,
static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL); static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
/** static struct attribute *iio_trig_dev_attrs[] = {
* iio_trigger_register_sysfs() - create a device for this trigger &dev_attr_name.attr,
* @trig_info: the trigger NULL,
* };
* Also adds any control attribute registered by the trigger driver
**/
static int iio_trigger_register_sysfs(struct iio_trigger *trig_info)
{
return sysfs_add_file_to_group(&trig_info->dev.kobj,
&dev_attr_name.attr,
NULL);
}
static void iio_trigger_unregister_sysfs(struct iio_trigger *trig_info) static struct attribute_group iio_trig_attr_group = {
{ .attrs = iio_trig_dev_attrs,
sysfs_remove_file_from_group(&trig_info->dev.kobj, };
&dev_attr_name.attr,
NULL); static const struct attribute_group *iio_trig_attr_groups[] = {
} &iio_trig_attr_group,
NULL
};
int iio_trigger_register(struct iio_trigger *trig_info) int iio_trigger_register(struct iio_trigger *trig_info)
{ {
@ -88,10 +82,6 @@ int iio_trigger_register(struct iio_trigger *trig_info)
if (ret) if (ret)
goto error_unregister_id; goto error_unregister_id;
ret = iio_trigger_register_sysfs(trig_info);
if (ret)
goto error_device_del;
/* Add to list of available triggers held by the IIO core */ /* Add to list of available triggers held by the IIO core */
mutex_lock(&iio_trigger_list_lock); mutex_lock(&iio_trigger_list_lock);
list_add_tail(&trig_info->list, &iio_trigger_list); list_add_tail(&trig_info->list, &iio_trigger_list);
@ -99,8 +89,6 @@ int iio_trigger_register(struct iio_trigger *trig_info)
return 0; return 0;
error_device_del:
device_del(&trig_info->dev);
error_unregister_id: error_unregister_id:
ida_simple_remove(&iio_trigger_ida, trig_info->id); ida_simple_remove(&iio_trigger_ida, trig_info->id);
error_ret: error_ret:
@ -114,7 +102,6 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
list_del(&trig_info->list); list_del(&trig_info->list);
mutex_unlock(&iio_trigger_list_lock); mutex_unlock(&iio_trigger_list_lock);
iio_trigger_unregister_sysfs(trig_info);
ida_simple_remove(&iio_trigger_ida, trig_info->id); ida_simple_remove(&iio_trigger_ida, trig_info->id);
/* Possible issue in here */ /* Possible issue in here */
device_unregister(&trig_info->dev); device_unregister(&trig_info->dev);
@ -406,6 +393,7 @@ static void iio_trig_release(struct device *device)
static struct device_type iio_trig_type = { static struct device_type iio_trig_type = {
.release = iio_trig_release, .release = iio_trig_release,
.groups = iio_trig_attr_groups,
}; };
static void iio_trig_subirqmask(struct irq_data *d) static void iio_trig_subirqmask(struct irq_data *d)