From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754448AbcAOOz7 (ORCPT ); Fri, 15 Jan 2016 09:55:59 -0500 Received: from mail-yk0-f179.google.com ([209.85.160.179]:35468 "EHLO mail-yk0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407AbcAOOz4 (ORCPT ); Fri, 15 Jan 2016 09:55:56 -0500 From: Gustavo Padovan To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, daniels@collabora.com, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Maarten Lankhorst , Gustavo Padovan Subject: [RFC 03/29] staging/android: rename sync_fence_release Date: Fri, 15 Jan 2016 12:55:13 -0200 Message-Id: <1452869739-3304-4-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan To avoid collision with an upcoming rename change the name of sync_fence_release() to sync_fence_release_file() Signed-off-by: Gustavo Padovan --- drivers/staging/android/sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index ed43796..4926bb0 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -534,7 +534,7 @@ static void sync_fence_free(struct kref *kref) kfree(fence); } -static int sync_fence_release(struct inode *inode, struct file *file) +static int sync_fence_file_release(struct inode *inode, struct file *file) { struct sync_fence *fence = file->private_data; @@ -724,7 +724,7 @@ static long sync_fence_ioctl(struct file *file, unsigned int cmd, } static const struct file_operations sync_fence_fops = { - .release = sync_fence_release, + .release = sync_fence_file_release, .poll = sync_fence_poll, .unlocked_ioctl = sync_fence_ioctl, .compat_ioctl = sync_fence_ioctl, -- 2.5.0