lkml.org 
[lkml]   [2010]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/19] staging:iio: Directory name changes to match new ABI.
    Date
    Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
    ---
    drivers/staging/iio/chrdev.h | 2 +-
    drivers/staging/iio/industrialio-core.c | 5 +++--
    drivers/staging/iio/industrialio-ring.c | 13 +++++++++----
    3 files changed, 13 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h
    index f42bafb..3f96f86 100644
    --- a/drivers/staging/iio/chrdev.h
    +++ b/drivers/staging/iio/chrdev.h
    @@ -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];
    };

    diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
    index 3df23be..3ac3ab5 100644
    --- a/drivers/staging/iio/industrialio-core.c
    +++ b/drivers/staging/iio/industrialio-core.c
    @@ -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
    diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
    index 44d4894..07b996e 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");
    @@ -278,7 +281,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;
    --
    1.6.4.4


    \
     
     \ /
      Last update: 2010-04-26 21:35    [W:0.055 / U:0.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site