system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 12:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging:iio: Directory name changes to match new ABI.

Browse source 
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 2010-05-04 14:43:06 +01:00 committed by Greg Kroah-Hartman
parent e34d2c5fa2
commit ba5c6fbac6
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/iio/chrdev.h
View file

@ -94,7 +94,7 @@ struct iio_event_interface {
struct iio_chrdev_minor_attr attr;
struct module *owner;
void *private;
char _name[20];
char _name[35];
char _attrname[20];
};

5
drivers/staging/iio/industrialio-core.c
View file

@ -660,8 +660,9 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)
dev_info->event_interfaces[i].id = ret;
snprintf(dev_info->event_interfaces[i]._name, 20,
"event_line%d",
dev_info->event_interfaces[i].id);
"%s:event%d",
dev_name(&dev_info->dev),
dev_info->event_interfaces[i].id);
ret = iio_setup_ev_int(&dev_info->event_interfaces[i],
(const char *)(dev_info

13
drivers/staging/iio/industrialio-ring.c
View file

@ -164,8 +164,9 @@ __iio_request_ring_buffer_event_chrdev(struct iio_ring_buffer *buf,
else
buf->ev_int.id = ret;
snprintf(buf->ev_int._name, 20,
"ring_event_line%d",
snprintf(buf->ev_int._name, sizeof(buf->ev_int._name),
"%s:event%d",
dev_name(&buf->dev),
buf->ev_int.id);
ret = iio_setup_ev_int(&(buf->ev_int),
buf->ev_int._name,
@ -226,7 +227,9 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
goto error_device_put;
else
buf->access_id = ret;
dev_set_name(&buf->access_dev, "ring_access%d", buf->access_id);
dev_set_name(&buf->access_dev, "%s:access%d",
dev_name(&buf->dev),
buf->access_id);
ret = device_add(&buf->access_dev);
if (ret < 0) {
printk(KERN_ERR "failed to add the ring access dev\n");
@ -280,7 +283,9 @@ int iio_ring_buffer_register(struct iio_ring_buffer *ring)
else
ring->id = ret;
dev_set_name(&ring->dev, "ring_buffer%d", ring->id);
dev_set_name(&ring->dev, "%s:buffer%d",
dev_name(ring->dev.parent),
ring->id);
ret = device_add(&ring->dev);
if (ret)
goto error_free_id;