aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-04-28 10:46:48 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-29 17:37:10 -0700
commita64d6a68667e61f34b27df294e25da6a45f31ff2 (patch)
treeddaceb899162545914c0650e62610d1c0c22dd64
parent2d75c88fefb228aedfb135228acb6620db8f0e40 (diff)
staging/android: remove redundant comments on sync_merge_data
struct sync_merge_data already have documentation on top of the struct definition. No need to duplicate it. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/uapi/sync.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
index 7de5d6a..413303d 100644
--- a/drivers/staging/android/uapi/sync.h
+++ b/drivers/staging/android/uapi/sync.h
@@ -23,9 +23,9 @@
* @pad: padding for 64-bit alignment, should always be zero
*/
struct sync_merge_data {
- char name[32]; /* name of new fence */
- __s32 fd2; /* fd of second fence */
- __s32 fence; /* fd on newly created fence */
+ char name[32];
+ __s32 fd2;
+ __s32 fence;
__u32 flags;
__u32 pad;
};
@@ -33,8 +33,8 @@ struct sync_merge_data {
/**
* struct sync_fence_info - detailed fence information
* @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
+* @driver_name: name of driver implementing the parent
+* @status: status of the fence 0:active 1:signaled <0:error
* @flags: fence_info flags
* @timestamp_ns: timestamp of status change in nanoseconds
*/