Commit ba5c6fba authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

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

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e34d2c5f
...@@ -94,7 +94,7 @@ struct iio_event_interface { ...@@ -94,7 +94,7 @@ struct iio_event_interface {
struct iio_chrdev_minor_attr attr; struct iio_chrdev_minor_attr attr;
struct module *owner; struct module *owner;
void *private; void *private;
char _name[20]; char _name[35];
char _attrname[20]; char _attrname[20];
}; };
......
...@@ -660,7 +660,8 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) ...@@ -660,7 +660,8 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)
dev_info->event_interfaces[i].id = ret; dev_info->event_interfaces[i].id = ret;
snprintf(dev_info->event_interfaces[i]._name, 20, snprintf(dev_info->event_interfaces[i]._name, 20,
"event_line%d", "%s:event%d",
dev_name(&dev_info->dev),
dev_info->event_interfaces[i].id); dev_info->event_interfaces[i].id);
ret = iio_setup_ev_int(&dev_info->event_interfaces[i], ret = iio_setup_ev_int(&dev_info->event_interfaces[i],
......
...@@ -164,8 +164,9 @@ __iio_request_ring_buffer_event_chrdev(struct iio_ring_buffer *buf, ...@@ -164,8 +164,9 @@ __iio_request_ring_buffer_event_chrdev(struct iio_ring_buffer *buf,
else else
buf->ev_int.id = ret; buf->ev_int.id = ret;
snprintf(buf->ev_int._name, 20, snprintf(buf->ev_int._name, sizeof(buf->ev_int._name),
"ring_event_line%d", "%s:event%d",
dev_name(&buf->dev),
buf->ev_int.id); buf->ev_int.id);
ret = iio_setup_ev_int(&(buf->ev_int), ret = iio_setup_ev_int(&(buf->ev_int),
buf->ev_int._name, buf->ev_int._name,
...@@ -226,7 +227,9 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf, ...@@ -226,7 +227,9 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
goto error_device_put; goto error_device_put;
else else
buf->access_id = ret; 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); ret = device_add(&buf->access_dev);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "failed to add the ring access dev\n"); 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) ...@@ -280,7 +283,9 @@ int iio_ring_buffer_register(struct iio_ring_buffer *ring)
else else
ring->id = ret; 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); ret = device_add(&ring->dev);
if (ret) if (ret)
goto error_free_id; goto error_free_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment