Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752843AbcD2JAi (ORCPT ); Fri, 29 Apr 2016 05:00:38 -0400 Received: from out4133-146.mail.aliyun.com ([42.120.133.146]:39566 "EHLO out4133-146.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbcD2JAf (ORCPT ); Fri, 29 Apr 2016 05:00:35 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R211e4;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e02c03298;MF=hillf.zj@alibaba-inc.com;NM=1;PH=DS;RN=2;SR=0;TI=SMTPD_----4kiGOeg_1461919444; Reply-To: "Hillf Danton" From: "Hillf Danton" To: "Gustavo Padovan" Cc: "linux-kernel" References: <00fa01d1a1f3$05a2df60$10e89e20$@alibaba-inc.com> In-Reply-To: <00fa01d1a1f3$05a2df60$10e89e20$@alibaba-inc.com> Subject: Re: [PATCH v2 04/13] staging/android: make sync_file_merge() static Date: Fri, 29 Apr 2016 16:44:04 +0800 Message-ID: <00fb01d1a1f3$495ad730$dc108590$@alibaba-inc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQIOO1w5tenLUNR8fPoUr+ENWQ11zZ8nb1jw Content-Language: zh-cn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2088 Lines: 56 > > 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 > Reviewed-by: Daniel Vetter > --- Acked-by: Hillf Danton > drivers/staging/android/sync.c | 5 ++--- > drivers/staging/android/sync.h | 2 -- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c > index a89ded0..e9bf251 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; > @@ -310,7 +310,6 @@ struct sync_file *sync_file_merge(const char *name, > sync_file_debug_add(sync_file); > return sync_file; > } > -EXPORT_SYMBOL(sync_file_merge); > > static const char *android_fence_get_driver_name(struct fence *fence) > { > 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 > -- > 2.5.5 > >