From patchwork Fri Jan 15 14:55:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8041731 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 18DBD9F859 for ; Fri, 15 Jan 2016 14:56:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24C7A20434 for ; Fri, 15 Jan 2016 14:56:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BD70420439 for ; Fri, 15 Jan 2016 14:56:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 257AD72009; Fri, 15 Jan 2016 06:56:01 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f182.google.com (mail-yk0-f182.google.com [209.85.160.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id B18C572009 for ; Fri, 15 Jan 2016 06:55:59 -0800 (PST) Received: by mail-yk0-f182.google.com with SMTP id v14so451517907ykd.3 for ; Fri, 15 Jan 2016 06:55:59 -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=CwQz9wJApKLTui2iM8Utn6P9kI0lUJ/DEEkwK4zGqOc=; b=GX6hqAMPuNa9py5x4aAO6HXFanchz9D+LMR2ASsFXO97YN3MOTMdZn1785ruAwT6cM NeiHFQNFEK+V8pWImPgVWDHh5FI7SqYMDI0cqru1qO3WMORlbmIffabXuXDy4FY4d4qI aOUdoFVo9PAdl9KJWeG+uf6Q7Q9cTBKRWgNiA6uhLPeL3zNMKTo22tCQhA5hw1CUnDQu x4/nrFBz/NT8W8B38ZJtOvzdxvXTVzTHM8r79jO2OABFLfaUwWcruJcxPPiavY6pKLeE ABTVrBOygRkdUeMn2W/WHPJ3Tp8ABL1gi0Z8ztZCFdTHWS3+j4wuWRUOkQYWBW5zneFs xSLA== X-Gm-Message-State: ALoCoQl5hp2qZpB0bGLZXSQpR21IZ3ZWDknqFa50ti8cMzMZJ3dex+NbTvEXhuzn7GvkzbBvLcJaL/8MEFW4Oo1nSMqT+peyPA== X-Received: by 10.37.19.65 with SMTP id 62mr963529ybt.177.1452869758968; Fri, 15 Jan 2016 06:55:58 -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.55.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:55:58 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 04/29] staging/android: rename 'android_fence' to 'sync_fence' Date: Fri, 15 Jan 2016 12:55:14 -0200 Message-Id: <1452869739-3304-5-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 As we are de-staging it rename it to a name that is not related to android. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sync.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 4926bb0..fa756ef 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -31,7 +31,7 @@ #define CREATE_TRACE_POINTS #include "trace/sync.h" -static const struct fence_ops android_fence_ops; +static const struct fence_ops sync_fence_ops; static const struct file_operations sync_fence_fops; struct sync_timeline *sync_timeline_create(const struct sync_timeline_ops *ops, @@ -135,7 +135,7 @@ struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size) spin_lock_irqsave(&obj->child_list_lock, flags); sync_timeline_get(obj); - fence_init(&pt->base, &android_fence_ops, &obj->child_list_lock, + fence_init(&pt->base, &sync_fence_ops, &obj->child_list_lock, obj->context, ++obj->value); list_add_tail(&pt->child_list, &obj->child_list_head); INIT_LIST_HEAD(&pt->active_list); @@ -411,7 +411,7 @@ int sync_fence_wait(struct sync_fence *fence, long timeout) } EXPORT_SYMBOL(sync_fence_wait); -static const char *android_fence_get_driver_name(struct fence *fence) +static const char *sync_fence_get_driver_name(struct fence *fence) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); struct sync_timeline *parent = sync_pt_parent(pt); @@ -419,7 +419,7 @@ static const char *android_fence_get_driver_name(struct fence *fence) return parent->ops->driver_name; } -static const char *android_fence_get_timeline_name(struct fence *fence) +static const char *sync_fence_get_timeline_name(struct fence *fence) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); struct sync_timeline *parent = sync_pt_parent(pt); @@ -427,7 +427,7 @@ static const char *android_fence_get_timeline_name(struct fence *fence) return parent->name; } -static void android_fence_release(struct fence *fence) +static void sync_fence_release(struct fence *fence) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); struct sync_timeline *parent = sync_pt_parent(pt); @@ -446,7 +446,7 @@ static void android_fence_release(struct fence *fence) fence_free(&pt->base); } -static bool android_fence_signaled(struct fence *fence) +static bool sync_fence_signaled(struct fence *fence) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); struct sync_timeline *parent = sync_pt_parent(pt); @@ -458,19 +458,19 @@ static bool android_fence_signaled(struct fence *fence) return ret; } -static bool android_fence_enable_signaling(struct fence *fence) +static bool sync_fence_enable_signaling(struct fence *fence) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); struct sync_timeline *parent = sync_pt_parent(pt); - if (android_fence_signaled(fence)) + if (sync_fence_signaled(fence)) return false; list_add_tail(&pt->active_list, &parent->active_list_head); return true; } -static int android_fence_fill_driver_data(struct fence *fence, +static int sync_fence_fill_driver_data(struct fence *fence, void *data, int size) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); @@ -481,7 +481,7 @@ static int android_fence_fill_driver_data(struct fence *fence, return parent->ops->fill_driver_data(pt, data, size); } -static void android_fence_value_str(struct fence *fence, +static void sync_fence_value_str(struct fence *fence, char *str, int size) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); @@ -495,7 +495,7 @@ static void android_fence_value_str(struct fence *fence, parent->ops->pt_value_str(pt, str, size); } -static void android_fence_timeline_value_str(struct fence *fence, +static void sync_fence_timeline_value_str(struct fence *fence, char *str, int size) { struct sync_pt *pt = container_of(fence, struct sync_pt, base); @@ -509,16 +509,16 @@ static void android_fence_timeline_value_str(struct fence *fence, parent->ops->timeline_value_str(parent, str, size); } -static const struct fence_ops android_fence_ops = { - .get_driver_name = android_fence_get_driver_name, - .get_timeline_name = android_fence_get_timeline_name, - .enable_signaling = android_fence_enable_signaling, - .signaled = android_fence_signaled, +static const struct fence_ops sync_fence_ops = { + .get_driver_name = sync_fence_get_driver_name, + .get_timeline_name = sync_fence_get_timeline_name, + .enable_signaling = sync_fence_enable_signaling, + .signaled = sync_fence_signaled, .wait = fence_default_wait, - .release = android_fence_release, - .fill_driver_data = android_fence_fill_driver_data, - .fence_value_str = android_fence_value_str, - .timeline_value_str = android_fence_timeline_value_str, + .release = sync_fence_release, + .fill_driver_data = sync_fence_fill_driver_data, + .fence_value_str = sync_fence_value_str, + .timeline_value_str = sync_fence_timeline_value_str, }; static void sync_fence_free(struct kref *kref)