diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-05-04 14:43:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:36:05 -0700 |
| commit | ba5c6fbac6682240ac209a209b88a30be4a464fb (patch) | |
| tree | 40edd1b89ece9231cb39edeef4f7b79dbe906414 /drivers/staging/iio/industrialio-ring.c | |
| parent | e34d2c5fa2254197b0a01925cc6f77e12552f9b9 (diff) | |
| download | kernel_samsung_smdk4412-ba5c6fbac6682240ac209a209b88a30be4a464fb.zip kernel_samsung_smdk4412-ba5c6fbac6682240ac209a209b88a30be4a464fb.tar.gz kernel_samsung_smdk4412-ba5c6fbac6682240ac209a209b88a30be4a464fb.tar.bz2 | |
staging:iio: Directory name changes to match new ABI.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/industrialio-ring.c')
| -rw-r--r-- | drivers/staging/iio/industrialio-ring.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index 690df91..0f19bd1 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -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; |