Modified: trunk/drivers/staging/iio/chrdev.h (8782 => 8783)
--- trunk/drivers/staging/iio/chrdev.h 2010-05-23 03:42:12 UTC (rev 8782)
+++ trunk/drivers/staging/iio/chrdev.h 2010-05-23 03:42:42 UTC (rev 8783)
@@ -94,7 +94,7 @@
struct iio_chrdev_minor_attr attr;
struct module *owner;
void *private;
- char _name[20];
+ char _name[35];
char _attrname[20];
};
Modified: trunk/drivers/staging/iio/industrialio-core.c (8782 => 8783)
--- trunk/drivers/staging/iio/industrialio-core.c 2010-05-23 03:42:12 UTC (rev 8782)
+++ trunk/drivers/staging/iio/industrialio-core.c 2010-05-23 03:42:42 UTC (rev 8783)
@@ -661,8 +661,9 @@
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
Modified: trunk/drivers/staging/iio/industrialio-ring.c (8782 => 8783)
--- trunk/drivers/staging/iio/industrialio-ring.c 2010-05-23 03:42:12 UTC (rev 8782)
+++ trunk/drivers/staging/iio/industrialio-ring.c 2010-05-23 03:42:42 UTC (rev 8783)
@@ -164,8 +164,9 @@
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 @@
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 @@
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;
