lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 05/11] staging/android: remove len field from struct sync_fence_info
    Date
    From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

    After removing driver_data struct sync_fence_info has now a fixed size,
    thus it doesn't need any field to tell its size, it is already known.

    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
    ---
    drivers/staging/android/sync.c | 4 +---
    drivers/staging/android/uapi/sync.h | 2 --
    2 files changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
    index d527878..2ab0c20 100644
    --- a/drivers/staging/android/sync.c
    +++ b/drivers/staging/android/sync.c
    @@ -486,8 +486,6 @@ static int sync_fill_fence_info(struct fence *fence, void *data, int size)
    if (size < sizeof(*info))
    return -ENOMEM;

    - info->len = sizeof(*info);
    -
    strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
    sizeof(info->obj_name));
    strlcpy(info->driver_name, fence->ops->get_driver_name(fence),
    @@ -498,7 +496,7 @@ static int sync_fill_fence_info(struct fence *fence, void *data, int size)
    info->status = 0;
    info->timestamp_ns = ktime_to_ns(fence->timestamp);

    - return info->len;
    + return sizeof(*info);
    }

    static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
    diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
    index 4d8cf00..a0cf357 100644
    --- a/drivers/staging/android/uapi/sync.h
    +++ b/drivers/staging/android/uapi/sync.h
    @@ -28,14 +28,12 @@ struct sync_merge_data {

    /**
    * struct sync_fence_info - detailed fence information
    - * @len: length of sync_fence_info
    * @obj_name: name of parent sync_timeline
    * @driver_name: name of driver implementing the parent
    * @status: status of the fence 0:active 1:signaled <0:error
    * @timestamp_ns: timestamp of status change in nanoseconds
    */
    struct sync_fence_info {
    - __u32 len;
    char obj_name[32];
    char driver_name[32];
    __s32 status;
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-02-03 15:21    [W:2.541 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site