From patchwork Wed Apr 27 16:27:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 8959921 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 5F427BF29F for ; Wed, 27 Apr 2016 16:28:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99D2E20259 for ; Wed, 27 Apr 2016 16:28:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D13D02011D for ; Wed, 27 Apr 2016 16:28:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 662516EB8F; Wed, 27 Apr 2016 16:28:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id F33016EB89 for ; Wed, 27 Apr 2016 16:27:45 +0000 (UTC) Received: by mail-yw0-f195.google.com with SMTP id y6so316695ywe.0 for ; Wed, 27 Apr 2016 09:27:45 -0700 (PDT) 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=f5nfs7Vga+LcwoqBgiQgkjUdFDGclI2s2rGGC0d8HM8=; b=cs0MPyt+m48znIqsxCMlAH2/mQGUbbnwciCyYht8um9RyaMJuiwuWGcCBX4h7lFts8 Su+LQYdd55mV4eRCId/aQS0+8OdA9zizanSg7B+WQiEjee8Jmvz6ZQM55qKjupThpJ5o wMS9JAvIvbDRI9qxvmWBbCOxxvdH3Z59OIiA8Fvmson5dHhmXXQmeehlo4sAKlrfX+4P jupRnj/47suFxG0p9Eq5j3uVi4kqw2H7vf7a6mfdvhzAMKa5rb2CZbsLXAH4rQYpidM+ DGNpmXIH7WVwLkgPQRoB+dFfZkLjvmS8gX5Ss2WZz2A+oFfgGVu/QFyGoIPS86n5aHhV vgqw== X-Gm-Message-State: AOPr4FXG0rbp64YDCPyzC8ojz8jXV6P0pDSTLV5tA2C746+I4+yDH2var4uG/e3yqJa+JA== X-Received: by 10.129.31.212 with SMTP id f203mr5254583ywf.95.1461774464447; Wed, 27 Apr 2016 09:27:44 -0700 (PDT) Received: from jade.localdomain ([201.82.24.203]) by smtp.gmail.com with ESMTPSA id k80sm2308816ywe.31.2016.04.27.09.27.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2016 09:27:43 -0700 (PDT) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH 04/12] staging/android: make sync_file_merge() static Date: Wed, 27 Apr 2016 13:27:11 -0300 Message-Id: <1461774439-11512-5-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461774439-11512-1-git-send-email-gustavo@padovan.org> References: <1461774439-11512-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , 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=-3.8 required=5.0 tests=BAYES_00, RCVD_IN_BL_SPAMCOP_NET, 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 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 --- 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