From patchwork Fri Jan 15 14:55:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8041831 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C848BBEEE1 for ; Fri, 15 Jan 2016 14:56:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D26102044B for ; Fri, 15 Jan 2016 14:56:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8B0E020384 for ; Fri, 15 Jan 2016 14:56:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA9FE7A0E9; Fri, 15 Jan 2016 06:56:23 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f176.google.com (mail-yk0-f176.google.com [209.85.160.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id 797CE7A0EA for ; Fri, 15 Jan 2016 06:56:22 -0800 (PST) Received: by mail-yk0-f176.google.com with SMTP id x67so546602664ykd.2 for ; Fri, 15 Jan 2016 06:56:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5z3ueRu6+IIEyZYATYmhFeFiov7SyS91K4zZEeRjCAI=; b=Snmb18vM6kAM/Mo/sw9Hw+4YDcCssu+LkVZVk5sIn/7gEv+JavG0KQdh4DQ56V9KEJ HVOL/pMueU+WaIHV38o2N66XOze7CIfElEYCbn+pAuJY5Z/IC2Z7GVcb6BCW2kK0QSom 9F5gyvj60UTFaGmnSfs0+V+sH6GfJIiLnWT2yQdLY3ttr8jPfZ1cI0IGsvs2sWnr62RH 3/zIhiPVi4GkUOwv/K77ZZL/N7rsWDZ6uHQU2VcsKh6ZczdGsf/LOMSNlIpBU3aSwa+b NYqoMiA+4svfx/iVY1zVIy3mW0TLIjYs/+4xfxXEuGWO7VlLxkwbJNkqu1mrzPYsrU8K q5Rg== X-Gm-Message-State: ALoCoQn0cFIVEwj7nYO+FNUKbBlUUIrwuLoKBjC+OjCUlppk5CYNsGbJATh9oHdO0SZTgUvYRJYSrI9d8Z7juu6KxoLW0JyEVA== X-Received: by 10.13.252.131 with SMTP id m125mr8344073ywf.104.1452869781741; Fri, 15 Jan 2016 06:56:21 -0800 (PST) Received: from jade.localdomain ([2804:14c:487:41f:6257:18ff:feab:2e8f]) by smtp.gmail.com with ESMTPSA id o123sm8267717ywd.2.2016.01.15.06.56.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:56:21 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Date: Fri, 15 Jan 2016 12:55:20 -0200 Message-Id: <1452869739-3304-11-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> References: <1452869739-3304-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, daniels@collabora.com, Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Maarten Lankhorst , Gustavo Padovan , John Harrison X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan '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 --- 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 c47b68d..decff9e 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -197,7 +197,7 @@ struct sync_fence *sync_fence_create_dma(const char *name, struct fence *pt) sync_fence->num_fences = 1; atomic_set(&sync_fence->status, 1); - sync_fence->cbs[0].sync_pt = pt; + sync_fence->cbs[0].fence = pt; sync_fence->cbs[0].sync_fence = sync_fence; if (fence_add_callback(pt, &sync_fence->cbs[0].cb, fence_check_cb_func)) atomic_dec(&sync_fence->status); @@ -247,7 +247,7 @@ EXPORT_SYMBOL(sync_fence_install); static void sync_fence_add_pt(struct sync_fence *sync_fence, int *i, struct fence *pt) { - sync_fence->cbs[*i].sync_pt = pt; + sync_fence->cbs[*i].fence = pt; sync_fence->cbs[*i].sync_fence = sync_fence; if (!fence_add_callback(pt, &sync_fence->cbs[*i].cb, @@ -279,8 +279,8 @@ struct sync_fence *sync_fence_merge(const char *name, * and sync_fence_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_fence_add_pt(sync_fence, &i, pt_a); @@ -302,10 +302,10 @@ struct sync_fence *sync_fence_merge(const char *name, } for (; i_a < a->num_fences; i_a++) - sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].sync_pt); + sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].fence); for (; i_b < b->num_fences; i_b++) - sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].sync_pt); + sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].fence); if (num_fences > i) atomic_sub(num_fences - i, &sync_fence->status); @@ -384,7 +384,7 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) trace_sync_wait(sync_fence, 1); for (i = 0; i < sync_fence->num_fences; ++i) - trace_sync_pt(sync_fence->cbs[i].sync_pt); + trace_sync_pt(sync_fence->cbs[i].fence); ret = wait_event_interruptible_timeout(sync_fence->wq, atomic_read(&sync_fence->status) <= 0, timeout); @@ -525,9 +525,9 @@ static void sync_fence_free(struct kref *kref) int i; for (i = 0; i < sync_fence->num_fences; ++i) { - fence_remove_callback(sync_fence->cbs[i].sync_pt, + fence_remove_callback(sync_fence->cbs[i].fence, &sync_fence->cbs[i].cb); - fence_put(sync_fence->cbs[i].sync_pt); + fence_put(sync_fence->cbs[i].fence); } kfree(sync_fence); @@ -681,7 +681,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence *sync_fence, len = sizeof(struct sync_fence_info_data); for (i = 0; i < sync_fence->num_fences; ++i) { - struct fence *pt = sync_fence->cbs[i].sync_pt; + struct fence *pt = sync_fence->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 0fed642..43f72a7 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_fence_cb { struct fence_cb cb; - struct fence *sync_pt; + struct fence *fence; struct sync_fence *sync_fence; }; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index cfa92d2..78e9147 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -163,7 +163,7 @@ static void sync_print_sync_fence(struct seq_file *s, sync_status_str(atomic_read(&sync_fence->status))); for (i = 0; i < sync_fence->num_fences; ++i) { - sync_print_pt(s, sync_fence->cbs[i].sync_pt, true); + sync_print_pt(s, sync_fence->cbs[i].fence, true); } spin_lock_irqsave(&sync_fence->wq.lock, flags);