Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-11 15:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging:iio: Add core attribute handling for name of device.

Browse Source 
Saves on a fair bit of code replication.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-05-18 14:41:43 +01:00 committed by Greg Kroah-Hartman
parent 51c060a069
commit 1b732888d8
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/iio/iio.h
View File

@ -268,7 +268,7 @@ struct iio_dev {
int num_channels; int num_channels;
struct list_head channel_attr_list; struct list_head channel_attr_list;
char *name; /*device name - IMPLEMENT */ const char *name;
int (*read_raw)(struct iio_dev *indio_dev, int (*read_raw)(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, struct iio_chan_spec const *chan,
int *val, int *val,

23
drivers/staging/iio/industrialio-core.c
View File

@ -688,6 +688,16 @@ static void iio_device_remove_and_free_read_attr(struct iio_dev *dev_info,
kfree(p); kfree(p);
} }
static ssize_t iio_show_dev_name(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", indio_dev->name);
}
static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL);
static int iio_device_register_sysfs(struct iio_dev *dev_info) static int iio_device_register_sysfs(struct iio_dev *dev_info)
{ {
int i, ret = 0; int i, ret = 0;
@ -715,8 +725,15 @@ static int iio_device_register_sysfs(struct iio_dev *dev_info)
if (ret < 0) if (ret < 0)
goto error_clear_attrs; goto error_clear_attrs;
} }
if (dev_info->name) {
ret = sysfs_add_file_to_group(&dev_info->dev.kobj,
&dev_attr_name.attr,
NULL);
if (ret)
goto error_clear_attrs;
}
return 0; return 0;
error_clear_attrs: error_clear_attrs:
list_for_each_entry_safe(p, n, list_for_each_entry_safe(p, n,
&dev_info->channel_attr_list, l) { &dev_info->channel_attr_list, l) {
@ -734,6 +751,10 @@ static void iio_device_unregister_sysfs(struct iio_dev *dev_info)
{ {
struct iio_dev_attr *p, *n; struct iio_dev_attr *p, *n;
if (dev_info->name)
sysfs_remove_file_from_group(&dev_info->dev.kobj,
&dev_attr_name.attr,
NULL);
list_for_each_entry_safe(p, n, &dev_info->channel_attr_list, l) { list_for_each_entry_safe(p, n, &dev_info->channel_attr_list, l) {
list_del(&p->l); list_del(&p->l);
iio_device_remove_and_free_read_attr(dev_info, p); iio_device_remove_and_free_read_attr(dev_info, p);