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

Commit 4dff14e8 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

staging/android: make sync_file_merge() static 



There is no plan in the near future to use this function outside of this
file so keep it as static.

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 696f74cf

drivers/staging/android/sync.c

+2 −3
Original line number Diff line number Diff line
@@ -253,8 +253,8 @@ static void sync_file_add_pt(struct sync_file *sync_file, int *i, 
 * @a and @b.  @a and @b remain valid, independent sync_file. Returns the

 * new merged sync_file or NULL in case of error.

 */

struct sync_file *sync_file_merge(const char *name,

				  struct sync_file *a, struct sync_file *b)

static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,

					 struct sync_file *b)

{

	int num_fences = a->num_fences + b->num_fences;

	struct sync_file *sync_file;
@@ -310,7 +310,6 @@ struct sync_file *sync_file_merge(const char *name, 
	sync_file_debug_add(sync_file);

	return sync_file;

}

EXPORT_SYMBOL(sync_file_merge);



static const char *android_fence_get_driver_name(struct fence *fence)

{

drivers/staging/android/sync.h

+0 −2
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ void sync_timeline_signal(struct sync_timeline *obj); 
struct fence *sync_pt_create(struct sync_timeline *parent, int size);



struct sync_file *sync_file_create(const char *name, struct fence *fence);

struct sync_file *sync_file_merge(const char *name,

				    struct sync_file *a, struct sync_file *b);

struct sync_file *sync_file_fdget(int fd);



#ifdef CONFIG_DEBUG_FS