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

Commit 2a7c1db5 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

staging/android: drop sync_file_install() and sync_file_put() 



These two functions are just wrappers for one line functions, they
call fd_install() and fput() respectively, so just get rid of them
and use fd_install() and fput() directly for more simplicity.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a64d6a68

drivers/staging/android/sync.c

+4 −16
Original line number Diff line number Diff line
@@ -216,18 +216,6 @@ struct sync_file *sync_file_fdget(int fd) 
}

EXPORT_SYMBOL(sync_file_fdget);



void sync_file_put(struct sync_file *sync_file)

{

	fput(sync_file->file);

}

EXPORT_SYMBOL(sync_file_put);



void sync_file_install(struct sync_file *sync_file, int fd)

{

	fd_install(fd, sync_file->file);

}

EXPORT_SYMBOL(sync_file_install);



static void sync_file_add_pt(struct sync_file *sync_file, int *i,

			     struct fence *fence)

{
@@ -469,15 +457,15 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, 
		goto err_put_fence3;

	}



	sync_file_install(fence3, fd);

	sync_file_put(fence2);

	fd_install(fd, fence3->file);

	fput(fence2->file);

	return 0;



err_put_fence3:

	sync_file_put(fence3);

	fput(fence3->file);



err_put_fence2:

	sync_file_put(fence2);

	fput(fence2->file);



err_put_fd:

	put_unused_fd(fd);

drivers/staging/android/sync.h

+0 −19
Original line number Diff line number Diff line
@@ -203,25 +203,6 @@ struct sync_file *sync_file_merge(const char *name, 
 */

struct sync_file *sync_file_fdget(int fd);



/**

 * sync_file_put() - puts a reference of a sync_file

 * @sync_file:	sync_file to put

 *

 * Puts a reference on @sync_fence.  If this is the last reference, the

 * sync_fil and all it's sync_pts will be freed

 */

void sync_file_put(struct sync_file *sync_file);



/**

 * sync_file_install() - installs a sync_file into a file descriptor

 * @sync_file:	sync_file to install

 * @fd:		file descriptor in which to install the fence

 *

 * Installs @sync_file into @fd.  @fd's should be acquired through

 * get_unused_fd_flags(O_CLOEXEC).

 */

void sync_file_install(struct sync_file *sync_file, int fd);



#ifdef CONFIG_DEBUG_FS



void sync_timeline_debug_add(struct sync_timeline *obj);

drivers/staging/android/sync_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -272,12 +272,12 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, 


	data.fence = fd;

	if (copy_to_user((void __user *)arg, &data, sizeof(data))) {

		sync_file_put(sync_file);

		fput(sync_file->file);

		err = -EFAULT;

		goto err;

	}



	sync_file_install(sync_file, fd);

	fd_install(fd, sync_file->file);



	return 0;