>
> From: Gustavo Padovan <[email protected]>
>
> There is no plan in the near future to use this function outside of this
> file so keep it as static.
>
> Signed-off-by: Gustavo Padovan <[email protected]>
> Reviewed-by: Daniel Vetter <[email protected]>
> ---
Acked-by: Hillf Danton <[email protected]>
> drivers/staging/android/sync.c | 5 ++---
> drivers/staging/android/sync.h | 2 --
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> index a89ded0..e9bf251 100644
> --- a/drivers/staging/android/sync.c
> +++ b/drivers/staging/android/sync.c
> @@ -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)
> {
> diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
> index 925fba5..ffc6df6 100644
> --- a/drivers/staging/android/sync.h
> +++ b/drivers/staging/android/sync.h
> @@ -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
> --
> 2.5.5
>
>
