diff options
| author | Gustavo Padovan | 2016-02-03 14:25:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-08 02:34:58 +0100 |
| commit | c7434b8436f9fb79855f0a52e4e9665becb77aea (patch) | |
| tree | 52f9be55b84e088153a2fa8fa933be398c96b885 /drivers/staging/android/uapi | |
| parent | staging/android: rename sync_file_info_data to sync_file_info (diff) | |
| download | kernel-qcow2-linux-c7434b8436f9fb79855f0a52e4e9665becb77aea.tar.gz kernel-qcow2-linux-c7434b8436f9fb79855f0a52e4e9665becb77aea.tar.xz kernel-qcow2-linux-c7434b8436f9fb79855f0a52e4e9665becb77aea.zip | |
staging/android: remove driver_data from struct sync_fence_info
It is unclear in what situations driver_data should be used thus better do
not upstream it for now. If a need arises in the future a discussion can
be started to re-add it.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/uapi')
| -rw-r--r-- | drivers/staging/android/uapi/sync.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h index fcc0b3c5b6da..4d8cf0062f04 100644 --- a/drivers/staging/android/uapi/sync.h +++ b/drivers/staging/android/uapi/sync.h @@ -28,12 +28,11 @@ struct sync_merge_data { /** * struct sync_fence_info - detailed fence information - * @len: length of sync_fence_info including any driver_data + * @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 - * @driver_data: any driver dependent data */ struct sync_fence_info { __u32 len; @@ -41,8 +40,6 @@ struct sync_fence_info { char driver_name[32]; __s32 status; __u64 timestamp_ns; - - __u8 driver_data[0]; }; /** |