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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <1452869739-3304-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yk0-f171.google.com (mail-yk0-f171.google.com [209.85.160.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 210387A0DC for ; Fri, 15 Jan 2016 06:55:56 -0800 (PST) Received: by mail-yk0-f171.google.com with SMTP id k129so522494467yke.0 for ; Fri, 15 Jan 2016 06:55:56 -0800 (PST) In-Reply-To: <1452869739-3304-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman 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 List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK VG8gYXZvaWQgY29sbGlzaW9uIHdpdGggYW4gdXBjb21pbmcgcmVuYW1lIGNoYW5nZSB0aGUgbmFt ZSBvZgpzeW5jX2ZlbmNlX3JlbGVhc2UoKSB0byBzeW5jX2ZlbmNlX3JlbGVhc2VfZmlsZSgpCgpT aWduZWQtb2ZmLWJ5OiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEu Y28udWs+Ci0tLQogZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jIHwgNCArKy0tCiAxIGZp bGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lk L3N5bmMuYwppbmRleCBlZDQzNzk2Li40OTI2YmIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdp bmcvYW5kcm9pZC9zeW5jLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCkBA IC01MzQsNyArNTM0LDcgQEAgc3RhdGljIHZvaWQgc3luY19mZW5jZV9mcmVlKHN0cnVjdCBrcmVm ICprcmVmKQogCWtmcmVlKGZlbmNlKTsKIH0KIAotc3RhdGljIGludCBzeW5jX2ZlbmNlX3JlbGVh c2Uoc3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCitzdGF0aWMgaW50IHN5 bmNfZmVuY2VfZmlsZV9yZWxlYXNlKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpm aWxlKQogewogCXN0cnVjdCBzeW5jX2ZlbmNlICpmZW5jZSA9IGZpbGUtPnByaXZhdGVfZGF0YTsK IApAQCAtNzI0LDcgKzcyNCw3IEBAIHN0YXRpYyBsb25nIHN5bmNfZmVuY2VfaW9jdGwoc3RydWN0 IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg ZmlsZV9vcGVyYXRpb25zIHN5bmNfZmVuY2VfZm9wcyA9IHsKLQkucmVsZWFzZSA9IHN5bmNfZmVu Y2VfcmVsZWFzZSwKKwkucmVsZWFzZSA9IHN5bmNfZmVuY2VfZmlsZV9yZWxlYXNlLAogCS5wb2xs ID0gc3luY19mZW5jZV9wb2xsLAogCS51bmxvY2tlZF9pb2N0bCA9IHN5bmNfZmVuY2VfaW9jdGws CiAJLmNvbXBhdF9pb2N0bCA9IHN5bmNfZmVuY2VfaW9jdGwsCi0tIAoyLjUuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK