Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 323de43f authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

staging/android: remove len field from struct sync_fence_info 



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: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7434b84

drivers/staging/android/sync.c

+1 −3
Original line number Diff line number Diff line
@@ -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,

drivers/staging/android/uapi/sync.h

+0 −2
Original line number Diff line number Diff line
@@ -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;