From patchwork Fri Jan 15 14:55:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8042031 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 9D9AEBEEE1 for ; Fri, 15 Jan 2016 14:57:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A75E120453 for ; Fri, 15 Jan 2016 14:57:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8936620384 for ; Fri, 15 Jan 2016 14:57:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0BCA7A0F8; Fri, 15 Jan 2016 06:57:11 -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 608E07A0FC for ; Fri, 15 Jan 2016 06:57:10 -0800 (PST) Received: by mail-yk0-f182.google.com with SMTP id v14so451557791ykd.3 for ; Fri, 15 Jan 2016 06:57:10 -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=ueL3fxYoaEZHNle8AXGnUgQs/fr9nZzwFhlS/qwe7Cg=; b=C/djj4ukCL+Wf6Ax9fBYkVdGJhyoseIwpH6W+F1opjuv/uyhVCjykWEbQq5CsLZ26X Zw0Cvk00cER9asB4D1mXReNvH07D2a3zdajeJszFAcVf14K5lO3SFEsbzHpmuSx7GGuJ EXp2BGzsKvr/IPr7tDmHhqkfHlwcxPf9ePW/642izjCQ57YlH2XdCue3QGaON6JIfj/j 9hmFDsPm26vaLY17dc1m/kqS3gbrRs1vnWWh4835jeOZLtR5SaY1PCAt105qW197Al4D poRuj4333f8Y2ksFvjS/mVpRb9AgmUScenSaoIiSgWcmpGCZFB8pZUD9Jyu/K3+KVT33 eQvQ== X-Gm-Message-State: ALoCoQmx0p6evzdGuxXNGK8771leY1JgK20N5wP1giH8gK7Xn0LunQA73IHr0lx7BNP6ZLAYj/0CoC4OM2r0b2VF4wNhJqbYrA== X-Received: by 10.129.154.82 with SMTP id r79mr8578927ywg.15.1452869829709; Fri, 15 Jan 2016 06:57:09 -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.57.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 06:57:09 -0800 (PST) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [RFC 22/29] staging/android: remove sync_pt_create() Date: Fri, 15 Jan 2016 12:55:32 -0200 Message-Id: <1452869739-3304-23-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 get sw_sync_pt_create() to use fence_create_on_timeline() directly and remove an abstractions layers between fences and its users. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sw_sync.c | 22 ++++++++++++++-------- drivers/staging/android/sync.c | 20 -------------------- drivers/staging/android/sync.h | 7 ------- 3 files changed, 14 insertions(+), 35 deletions(-) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index b9f8c51..7250f1b 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -25,16 +25,22 @@ #include "sw_sync.h" +static const struct fence_ops sw_sync_fence_ops = { + .get_driver_name = fence_default_get_driver_name, + .get_timeline_name = fence_default_get_timeline_name, + .enable_signaling = fence_default_enable_signaling, + .signaled = fence_default_signaled, + .wait = fence_default_wait, + .release = fence_default_release, + .fill_driver_data = fence_default_fill_driver_data, + .fence_value_str = fence_default_value_str, + .timeline_value_str = fence_default_timeline_value_str, +}; + struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) { - struct sw_sync_pt *pt; - - pt = (struct sw_sync_pt *) - sync_pt_create(&obj->obj, sizeof(struct sw_sync_pt), value); - - pt->value = value; - - return (struct fence *)pt; + return fence_create_on_timeline(&obj->obj, &sw_sync_fence_ops, + sizeof(struct fence), value); } EXPORT_SYMBOL(sw_sync_pt_create); diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index 2365db7..956b4e9 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -31,16 +31,8 @@ #define CREATE_TRACE_POINTS #include "trace/sync.h" -static const struct fence_ops sync_fence_ops; static const struct file_operations sync_fence_fops; -struct fence *sync_pt_create(struct fence_timeline *obj, int size, u32 value) -{ - return fence_create_on_timeline(obj, &sync_fence_ops, - sizeof(struct fence), value); -} -EXPORT_SYMBOL(sync_pt_create); - static struct sync_fence *sync_fence_alloc(int size, const char *name) { struct sync_fence *sync_fence; @@ -305,18 +297,6 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) } EXPORT_SYMBOL(sync_fence_wait); -static const struct fence_ops sync_fence_ops = { - .get_driver_name = fence_default_get_driver_name, - .get_timeline_name = fence_default_get_timeline_name, - .enable_signaling = fence_default_enable_signaling, - .signaled = fence_default_signaled, - .wait = fence_default_wait, - .release = fence_default_release, - .fill_driver_data = fence_default_fill_driver_data, - .fence_value_str = fence_default_value_str, - .timeline_value_str = fence_default_timeline_value_str, -}; - static void sync_fence_free(struct kref *kref) { struct sync_fence *sync_fence = container_of(kref, struct sync_fence, diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index 569873f..256315c 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -78,13 +78,6 @@ static inline void sync_fence_waiter_init(struct sync_fence_waiter *waiter, waiter->callback = callback; } -/* - * API for fence_timeline implementers - */ - -struct fence *sync_pt_create(struct fence_timeline *parent, int size, - u32 value); - /** * sync_fence_create() - creates a sync fence * @name: name of fence to create