mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Gustavo Padovan <gustavo@padovan.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
	dri-devel@lists.freedesktop.org,
	"Daniel Stone" <daniels@collabora.com>,
	"Arve Hjønnevåg" <arve@android.com>,
	"Riley Andrews" <riandrews@android.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Rob Clark" <robdclark@gmail.com>,
	"Greg Hackmann" <ghackmann@google.com>,
	"John Harrison" <John.C.Harrison@Intel.com>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Sumit Semwal" <sumit.semwal@linaro.org>,
	"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [PATCH 04/12] staging/android: make sync_file_merge() static
Date: Wed, 27 Apr 2016 13:27:11 -0300	[thread overview]
Message-ID: <1461774439-11512-5-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1461774439-11512-1-git-send-email-gustavo@padovan.org>

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>
---
 drivers/staging/android/sync.c | 4 ++--
 drivers/staging/android/sync.h | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index a89ded0..c441fde 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;
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

  parent reply	other threads:[~2016-04-27 16:27 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-27 16:27 [PATCH 00/12] De-stage Sync File Framework Gustavo Padovan
2016-04-27 16:27 ` [PATCH 01/12] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan
2016-05-02 21:00   ` Pavel Machek
2016-05-02 21:11     ` Gustavo Padovan
2016-04-27 16:27 ` [PATCH 02/12] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan
2016-04-27 16:27 ` [PATCH 03/12] staging/android: move sync_file functions comments to sync.c Gustavo Padovan
2016-04-27 16:27 ` Gustavo Padovan [this message]
2016-04-27 16:27 ` [PATCH 05/12] staging/android: make sync_file_fdget() static Gustavo Padovan
2016-04-27 16:27 ` [PATCH 06/12] staging/android: prepare sync_file for de-staging Gustavo Padovan
2016-05-02 21:04   ` Pavel Machek
2016-05-02 21:13     ` Gustavo Padovan
2016-04-27 16:27 ` [PATCH 07/12] staging/android: improve documentation for sync_file Gustavo Padovan
2016-04-27 16:27 ` [PATCH 08/12] staging/android: style fix: alignment to match the open parenthesis Gustavo Padovan
2016-04-27 16:27 ` [PATCH 09/12] dma-buf/sync_file: de-stage sync_file headers Gustavo Padovan
2016-04-27 16:27 ` [PATCH 10/12] dma-buf/sync_file: de-stage sync_file Gustavo Padovan
2016-04-27 16:27 ` [PATCH 11/12] Documentation: include sync_file into DocBook Gustavo Padovan
2016-04-27 16:27 ` [PATCH 12/12] Documentation: add Sync File doc Gustavo Padovan
2016-04-27 19:05   ` Daniel Vetter
2016-04-27 19:09 ` [PATCH 00/12] De-stage Sync File Framework Daniel Vetter
2016-04-28 13:45   ` Gustavo Padovan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461774439-11512-5-git-send-email-gustavo@padovan.org \
    --to=gustavo@padovan.org \
    --cc=John.C.Harrison@Intel.com \
    --cc=arve@android.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniels@collabora.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=ghackmann@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=gustavo.padovan@collabora.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=riandrews@android.com \
    --cc=robdclark@gmail.com \
    --cc=sumit.semwal@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®