Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1390215

[PATCH v2 04/13] staging/android: make sync_file_merge() static

Show all headers | View raw

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

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 <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/13] De-stage Sync File Framework Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 06/13] staging/android: remove name arg from sync_file_create() Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 08/13] staging/android: improve documentation for sync_file Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 11/13] dma-buf/sync_file: de-stage sync_file Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 04/13] staging/android: make sync_file_merge() static Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 07/13] staging/android: prepare sync_file for de-staging Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 12/13] Documentation: include sync_file into DocBook Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 02/13] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 09/13] staging/android: style fix: alignment to match the open parenthesis Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 13/13] Documentation: add Sync File doc Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 15:50 +0200
  [PATCH v2 01/13] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 16:00 +0200
  [PATCH v2 03/13] staging/android: move sync_file functions comments to sync.c Gustavo Padovan <gustavo@padovan.org> - 2016-04-28 16:00 +0200
  Re: [PATCH v2 00/13] De-stage Sync File Framework Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-04-30 02:40 +0200

csiph-web