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>,
"Gustavo Padovan" <gustavo.padovan@collabora.co.uk>
Subject: [PATCH 07/11] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb
Date: Thu, 21 Jan 2016 10:49:20 -0200 [thread overview]
Message-ID: <1453380564-3328-8-git-send-email-gustavo@padovan.org> (raw)
In-Reply-To: <1453380564-3328-1-git-send-email-gustavo@padovan.org>
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
'sync_pt' is actually declared as struct fence so to make the name means
its type we rename it to 'fence'.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/staging/android/sync.c | 20 ++++++++++----------
drivers/staging/android/sync.h | 2 +-
drivers/staging/android/sync_debug.c | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 8cccdf9..22b1d9b 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -197,7 +197,7 @@ struct sync_file *sync_file_create_dma(const char *name, struct fence *pt)
sync_file->num_fences = 1;
atomic_set(&sync_file->status, 1);
- sync_file->cbs[0].sync_pt = pt;
+ sync_file->cbs[0].fence = pt;
sync_file->cbs[0].sync_file = sync_file;
if (fence_add_callback(pt, &sync_file->cbs[0].cb, fence_check_cb_func))
atomic_dec(&sync_file->status);
@@ -247,7 +247,7 @@ EXPORT_SYMBOL(sync_file_install);
static void sync_file_add_pt(struct sync_file *sync_file, int *i,
struct fence *pt)
{
- sync_file->cbs[*i].sync_pt = pt;
+ sync_file->cbs[*i].fence = pt;
sync_file->cbs[*i].sync_file = sync_file;
if (!fence_add_callback(pt, &sync_file->cbs[*i].cb,
@@ -279,8 +279,8 @@ struct sync_file *sync_file_merge(const char *name,
* and sync_file_create, this is a reasonable assumption.
*/
for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) {
- struct fence *pt_a = a->cbs[i_a].sync_pt;
- struct fence *pt_b = b->cbs[i_b].sync_pt;
+ struct fence *pt_a = a->cbs[i_a].fence;
+ struct fence *pt_b = b->cbs[i_b].fence;
if (pt_a->context < pt_b->context) {
sync_file_add_pt(sync_file, &i, pt_a);
@@ -302,10 +302,10 @@ struct sync_file *sync_file_merge(const char *name,
}
for (; i_a < a->num_fences; i_a++)
- sync_file_add_pt(sync_file, &i, a->cbs[i_a].sync_pt);
+ sync_file_add_pt(sync_file, &i, a->cbs[i_a].fence);
for (; i_b < b->num_fences; i_b++)
- sync_file_add_pt(sync_file, &i, b->cbs[i_b].sync_pt);
+ sync_file_add_pt(sync_file, &i, b->cbs[i_b].fence);
if (num_fences > i)
atomic_sub(num_fences - i, &sync_file->status);
@@ -328,7 +328,7 @@ int sync_file_wait(struct sync_file *sync_file, long timeout)
trace_sync_wait(sync_file, 1);
for (i = 0; i < sync_file->num_fences; ++i)
- trace_sync_pt(sync_file->cbs[i].sync_pt);
+ trace_sync_pt(sync_file->cbs[i].fence);
ret = wait_event_interruptible_timeout(sync_file->wq,
atomic_read(&sync_file->status) <= 0,
timeout);
@@ -468,9 +468,9 @@ static void sync_file_free(struct kref *kref)
int i;
for (i = 0; i < sync_file->num_fences; ++i) {
- fence_remove_callback(sync_file->cbs[i].sync_pt,
+ fence_remove_callback(sync_file->cbs[i].fence,
&sync_file->cbs[i].cb);
- fence_put(sync_file->cbs[i].sync_pt);
+ fence_put(sync_file->cbs[i].fence);
}
kfree(sync_file);
@@ -624,7 +624,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
len = sizeof(struct sync_file_info_data);
for (i = 0; i < sync_file->num_fences; ++i) {
- struct fence *pt = sync_file->cbs[i].sync_pt;
+ struct fence *pt = sync_file->cbs[i].fence;
ret = sync_fill_pt_info(pt, (u8 *)data + len, size - len);
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index bec62c3..a18d1e3 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -110,7 +110,7 @@ static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt)
struct sync_file_cb {
struct fence_cb cb;
- struct fence *sync_pt;
+ struct fence *fence;
struct sync_file *sync_file;
};
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index 6887ba7..1889b5b 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -161,7 +161,7 @@ static void sync_print_sync_file(struct seq_file *s,
sync_status_str(atomic_read(&sync_file->status)));
for (i = 0; i < sync_file->num_fences; ++i) {
- sync_print_pt(s, sync_file->cbs[i].sync_pt, true);
+ sync_print_pt(s, sync_file->cbs[i].fence, true);
}
}
--
2.5.0
next prev parent reply other threads:[~2016-01-21 12:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-21 12:49 [PATCH 00/11] sync framework de-staging: part 1 - clean up Gustavo Padovan
2016-01-21 12:49 ` [PATCH 01/11] staging/android: fix sync framework documentation Gustavo Padovan
2016-01-21 12:49 ` [PATCH 02/11] staging/android: sync: remove interfaces that are not used Gustavo Padovan
2016-01-21 12:49 ` [PATCH 03/11] staging/android: remove not used sync_timeline ops Gustavo Padovan
2016-01-21 12:49 ` [PATCH 04/11] staging/android: create a 'sync' dir for debugfs information Gustavo Padovan
2016-01-21 12:49 ` [PATCH 05/11] staging/android: move SW_SYNC_USER to a debugfs file Gustavo Padovan
2016-01-21 12:49 ` [PATCH 06/11] staging/android: rename sync_fence to sync_file Gustavo Padovan
2016-01-21 12:49 ` Gustavo Padovan [this message]
2016-01-21 12:49 ` [PATCH 08/11] staging/android: remove struct sync_pt Gustavo Padovan
2016-01-21 12:49 ` [PATCH 09/11] staging/android: remove unused var from sync_timeline_signal() Gustavo Padovan
2016-01-21 12:49 ` [PATCH 10/11] staging/android: remove pointless sync_timeline_signal at destroy phase Gustavo Padovan
2016-01-21 12:49 ` [PATCH 11/11] staging/android: remove sync_fence_create_dma() Gustavo Padovan
2016-01-25 11:23 ` [PATCH 00/11] sync framework de-staging: part 1 - clean up Maarten Lankhorst
2016-01-29 14:47 ` Gustavo Padovan
2016-01-29 16:10 ` Greg Kroah-Hartman
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=1453380564-3328-8-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 \
/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®