From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755433AbcAOO64 (ORCPT ); Fri, 15 Jan 2016 09:58:56 -0500 Received: from mail-yk0-f181.google.com ([209.85.160.181]:35709 "EHLO mail-yk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755184AbcAOO5O (ORCPT ); Fri, 15 Jan 2016 09:57:14 -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 23/29] staging/android: remove sw_sync_timeline and sw_sync_pt Date: Fri, 15 Jan 2016 12:55:33 -0200 Message-Id: <1452869739-3304-24-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 As we moved value storage to fence_timeline and fence those two structs became useless and can be removed now. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sw_sync.c | 15 ++++++--------- drivers/staging/android/sw_sync.h | 24 ++++++------------------ drivers/staging/android/sync_debug.c | 12 ++++++------ 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index 7250f1b..ee7a942 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -37,25 +37,22 @@ static const struct fence_ops sw_sync_fence_ops = { .timeline_value_str = fence_default_timeline_value_str, }; -struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) +struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value) { - return fence_create_on_timeline(&obj->obj, &sw_sync_fence_ops, + return fence_create_on_timeline(obj, &sw_sync_fence_ops, sizeof(struct fence), value); } EXPORT_SYMBOL(sw_sync_pt_create); -struct sw_sync_timeline *sw_sync_timeline_create(const char *name) +struct fence_timeline *sw_sync_timeline_create(const char *name) { - struct sw_sync_timeline *obj = (struct sw_sync_timeline *) - fence_timeline_create(1, sizeof(struct sw_sync_timeline), + return fence_timeline_create(1, sizeof(struct fence_timeline), "sw_sync", name); - - return obj; } EXPORT_SYMBOL(sw_sync_timeline_create); -void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) +void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc) { - fence_timeline_signal(&obj->obj, inc); + fence_timeline_signal(obj, inc); } EXPORT_SYMBOL(sw_sync_timeline_inc); diff --git a/drivers/staging/android/sw_sync.h b/drivers/staging/android/sw_sync.h index 85ef780..f912888 100644 --- a/drivers/staging/android/sw_sync.h +++ b/drivers/staging/android/sw_sync.h @@ -22,34 +22,22 @@ #include "sync.h" #include "uapi/sw_sync.h" -struct sw_sync_timeline { - struct fence_timeline obj; - - u32 value; -}; - -struct sw_sync_pt { - struct fence pt; - - u32 value; -}; - #if IS_ENABLED(CONFIG_SW_SYNC) -struct sw_sync_timeline *sw_sync_timeline_create(const char *name); -void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc); +struct fence_timeline *sw_sync_timeline_create(const char *name); +void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc); -struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value); +struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value); #else -static inline struct sw_sync_timeline *sw_sync_timeline_create(const char *name) +static inline struct fence_timeline *sw_sync_timeline_create(const char *name) { return NULL; } -static inline void sw_sync_timeline_inc(struct sw_sync_timeline *obj, u32 inc) +static inline void sw_sync_timeline_inc(struct fence_timeline *obj, u32 inc) { } -static inline struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, +static inline struct fence *sw_sync_pt_create(struct fence_timeline *obj, u32 value) { return NULL; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index 89b334c..13d225f 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -225,7 +225,7 @@ static const struct file_operations sync_info_debugfs_fops = { /* opening sw_sync create a new sync obj */ static int sw_sync_debugfs_open(struct inode *inode, struct file *file) { - struct sw_sync_timeline *obj; + struct fence_timeline *obj; char task_comm[TASK_COMM_LEN]; get_task_comm(task_comm, current); @@ -241,13 +241,13 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file) static int sw_sync_debugfs_release(struct inode *inode, struct file *file) { - struct sw_sync_timeline *obj = file->private_data; + struct fence_timeline *obj = file->private_data; - fence_timeline_destroy(&obj->obj); + fence_timeline_destroy(obj); return 0; } -static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, +static long sw_sync_ioctl_create_fence(struct fence_timeline *obj, unsigned long arg) { int fd = get_unused_fd_flags(O_CLOEXEC); @@ -294,7 +294,7 @@ err: return err; } -static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) +static long sw_sync_ioctl_inc(struct fence_timeline *obj, unsigned long arg) { u32 value; @@ -309,7 +309,7 @@ static long sw_sync_ioctl_inc(struct sw_sync_timeline *obj, unsigned long arg) static long sw_sync_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct sw_sync_timeline *obj = file->private_data; + struct fence_timeline *obj = file->private_data; switch (cmd) { case SW_SYNC_IOC_CREATE_FENCE: -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 23/29] staging/android: remove sw_sync_timeline and sw_sync_pt Date: Fri, 15 Jan 2016 12:55:33 -0200 Message-ID: <1452869739-3304-24-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 F0E5D7A0FB for ; Fri, 15 Jan 2016 06:57:13 -0800 (PST) Received: by mail-yk0-f171.google.com with SMTP id a85so467200861ykb.1 for ; Fri, 15 Jan 2016 06:57:13 -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 QXMgd2UgbW92ZWQgdmFsdWUgc3RvcmFnZSB0byBmZW5jZV90aW1lbGluZSBhbmQgZmVuY2UgdGhv c2UgdHdvIHN0cnVjdHMKYmVjYW1lIHVzZWxlc3MgYW5kIGNhbiBiZSByZW1vdmVkIG5vdy4KClNp Z25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5j by51az4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMgICAgfCAxNSArKysr KystLS0tLS0tLS0KIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuaCAgICB8IDI0ICsr KysrKy0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1 Zy5jIHwgMTIgKysrKysrLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyks IDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3 X3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuYwppbmRleCA3MjUwZjFi Li5lZTdhOTQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMK KysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5jCkBAIC0zNywyNSArMzcsMjIg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBmZW5jZV9vcHMgc3dfc3luY19mZW5jZV9vcHMgPSB7CiAJ LnRpbWVsaW5lX3ZhbHVlX3N0ciA9IGZlbmNlX2RlZmF1bHRfdGltZWxpbmVfdmFsdWVfc3RyLAog fTsKIAotc3RydWN0IGZlbmNlICpzd19zeW5jX3B0X2NyZWF0ZShzdHJ1Y3Qgc3dfc3luY190aW1l bGluZSAqb2JqLCB1MzIgdmFsdWUpCitzdHJ1Y3QgZmVuY2UgKnN3X3N5bmNfcHRfY3JlYXRlKHN0 cnVjdCBmZW5jZV90aW1lbGluZSAqb2JqLCB1MzIgdmFsdWUpCiB7Ci0JcmV0dXJuIGZlbmNlX2Ny ZWF0ZV9vbl90aW1lbGluZSgmb2JqLT5vYmosICZzd19zeW5jX2ZlbmNlX29wcywKKwlyZXR1cm4g ZmVuY2VfY3JlYXRlX29uX3RpbWVsaW5lKG9iaiwgJnN3X3N5bmNfZmVuY2Vfb3BzLAogCQkJCQkg c2l6ZW9mKHN0cnVjdCBmZW5jZSksIHZhbHVlKTsKIH0KIEVYUE9SVF9TWU1CT0woc3dfc3luY19w dF9jcmVhdGUpOwogCi1zdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqc3dfc3luY190aW1lbGluZV9j cmVhdGUoY29uc3QgY2hhciAqbmFtZSkKK3N0cnVjdCBmZW5jZV90aW1lbGluZSAqc3dfc3luY190 aW1lbGluZV9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSkKIHsKLQlzdHJ1Y3Qgc3dfc3luY190aW1l bGluZSAqb2JqID0gKHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICopCi0JCWZlbmNlX3RpbWVsaW5l X2NyZWF0ZSgxLCBzaXplb2Yoc3RydWN0IHN3X3N5bmNfdGltZWxpbmUpLAorCXJldHVybiBmZW5j ZV90aW1lbGluZV9jcmVhdGUoMSwgc2l6ZW9mKHN0cnVjdCBmZW5jZV90aW1lbGluZSksCiAJCQkJ ICAgICAic3dfc3luYyIsIG5hbWUpOwotCi0JcmV0dXJuIG9iajsKIH0KIEVYUE9SVF9TWU1CT0wo c3dfc3luY190aW1lbGluZV9jcmVhdGUpOwogCi12b2lkIHN3X3N5bmNfdGltZWxpbmVfaW5jKHN0 cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosIHUzMiBpbmMpCit2b2lkIHN3X3N5bmNfdGltZWxp bmVfaW5jKHN0cnVjdCBmZW5jZV90aW1lbGluZSAqb2JqLCB1MzIgaW5jKQogewotCWZlbmNlX3Rp bWVsaW5lX3NpZ25hbCgmb2JqLT5vYmosIGluYyk7CisJZmVuY2VfdGltZWxpbmVfc2lnbmFsKG9i aiwgaW5jKTsKIH0KIEVYUE9SVF9TWU1CT0woc3dfc3luY190aW1lbGluZV9pbmMpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5oIGIvZHJpdmVycy9zdGFnaW5n L2FuZHJvaWQvc3dfc3luYy5oCmluZGV4IDg1ZWY3ODAuLmY5MTI4ODggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5k cm9pZC9zd19zeW5jLmgKQEAgLTIyLDM0ICsyMiwyMiBAQAogI2luY2x1ZGUgInN5bmMuaCIKICNp bmNsdWRlICJ1YXBpL3N3X3N5bmMuaCIKIAotc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgewotCXN0 cnVjdAlmZW5jZV90aW1lbGluZQlvYmo7Ci0KLQl1MzIJCQl2YWx1ZTsKLX07Ci0KLXN0cnVjdCBz d19zeW5jX3B0IHsKLQlzdHJ1Y3QgZmVuY2UJCXB0OwotCi0JdTMyCQkJdmFsdWU7Ci19OwotCiAj aWYgSVNfRU5BQkxFRChDT05GSUdfU1dfU1lOQykKLXN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpz d19zeW5jX3RpbWVsaW5lX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lKTsKLXZvaWQgc3dfc3luY190 aW1lbGluZV9pbmMoc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKm9iaiwgdTMyIGluYyk7CitzdHJ1 Y3QgZmVuY2VfdGltZWxpbmUgKnN3X3N5bmNfdGltZWxpbmVfY3JlYXRlKGNvbnN0IGNoYXIgKm5h bWUpOwordm9pZCBzd19zeW5jX3RpbWVsaW5lX2luYyhzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9i aiwgdTMyIGluYyk7CiAKLXN0cnVjdCBmZW5jZSAqc3dfc3luY19wdF9jcmVhdGUoc3RydWN0IHN3 X3N5bmNfdGltZWxpbmUgKm9iaiwgdTMyIHZhbHVlKTsKK3N0cnVjdCBmZW5jZSAqc3dfc3luY19w dF9jcmVhdGUoc3RydWN0IGZlbmNlX3RpbWVsaW5lICpvYmosIHUzMiB2YWx1ZSk7CiAjZWxzZQot c3RhdGljIGlubGluZSBzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqc3dfc3luY190aW1lbGluZV9j cmVhdGUoY29uc3QgY2hhciAqbmFtZSkKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGZlbmNlX3RpbWVs aW5lICpzd19zeW5jX3RpbWVsaW5lX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lKQogewogCXJldHVy biBOVUxMOwogfQogCi1zdGF0aWMgaW5saW5lIHZvaWQgc3dfc3luY190aW1lbGluZV9pbmMoc3Ry dWN0IHN3X3N5bmNfdGltZWxpbmUgKm9iaiwgdTMyIGluYykKK3N0YXRpYyBpbmxpbmUgdm9pZCBz d19zeW5jX3RpbWVsaW5lX2luYyhzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9iaiwgdTMyIGluYykK IHsKIH0KIAotc3RhdGljIGlubGluZSBzdHJ1Y3QgZmVuY2UgKnN3X3N5bmNfcHRfY3JlYXRlKHN0 cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosCitzdGF0aWMgaW5saW5lIHN0cnVjdCBmZW5jZSAq c3dfc3luY19wdF9jcmVhdGUoc3RydWN0IGZlbmNlX3RpbWVsaW5lICpvYmosCiAJCQkJCSAgICAg IHUzMiB2YWx1ZSkKIHsKIAlyZXR1cm4gTlVMTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL3N5bmNfZGVidWcuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmNfZGVi dWcuYwppbmRleCA4OWIzMzRjLi4xM2QyMjVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdpbmcv YW5kcm9pZC9zeW5jX2RlYnVnLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19k ZWJ1Zy5jCkBAIC0yMjUsNyArMjI1LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBmaWxlX29wZXJh dGlvbnMgc3luY19pbmZvX2RlYnVnZnNfZm9wcyA9IHsKIC8qIG9wZW5pbmcgc3dfc3luYyBjcmVh dGUgYSBuZXcgc3luYyBvYmogKi8KIHN0YXRpYyBpbnQgc3dfc3luY19kZWJ1Z2ZzX29wZW4oc3Ry dWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCiB7Ci0Jc3RydWN0IHN3X3N5bmNf dGltZWxpbmUgKm9iajsKKwlzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9iajsKIAljaGFyIHRhc2tf Y29tbVtUQVNLX0NPTU1fTEVOXTsKIAogCWdldF90YXNrX2NvbW0odGFza19jb21tLCBjdXJyZW50 KTsKQEAgLTI0MSwxMyArMjQxLDEzIEBAIHN0YXRpYyBpbnQgc3dfc3luY19kZWJ1Z2ZzX29wZW4o c3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCiAKIHN0YXRpYyBpbnQgc3df c3luY19kZWJ1Z2ZzX3JlbGVhc2Uoc3RydWN0IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZp bGUpCiB7Ci0Jc3RydWN0IHN3X3N5bmNfdGltZWxpbmUgKm9iaiA9IGZpbGUtPnByaXZhdGVfZGF0 YTsKKwlzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9iaiA9IGZpbGUtPnByaXZhdGVfZGF0YTsKIAot CWZlbmNlX3RpbWVsaW5lX2Rlc3Ryb3koJm9iai0+b2JqKTsKKwlmZW5jZV90aW1lbGluZV9kZXN0 cm95KG9iaik7CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBsb25nIHN3X3N5bmNfaW9jdGxfY3Jl YXRlX2ZlbmNlKHN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmosCitzdGF0aWMgbG9uZyBzd19z eW5jX2lvY3RsX2NyZWF0ZV9mZW5jZShzdHJ1Y3QgZmVuY2VfdGltZWxpbmUgKm9iaiwKIAkJCQkg ICAgICAgdW5zaWduZWQgbG9uZyBhcmcpCiB7CiAJaW50IGZkID0gZ2V0X3VudXNlZF9mZF9mbGFn cyhPX0NMT0VYRUMpOwpAQCAtMjk0LDcgKzI5NCw3IEBAIGVycjoKIAlyZXR1cm4gZXJyOwogfQog Ci1zdGF0aWMgbG9uZyBzd19zeW5jX2lvY3RsX2luYyhzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAq b2JqLCB1bnNpZ25lZCBsb25nIGFyZykKK3N0YXRpYyBsb25nIHN3X3N5bmNfaW9jdGxfaW5jKHN0 cnVjdCBmZW5jZV90aW1lbGluZSAqb2JqLCB1bnNpZ25lZCBsb25nIGFyZykKIHsKIAl1MzIgdmFs dWU7CiAKQEAgLTMwOSw3ICszMDksNyBAQCBzdGF0aWMgbG9uZyBzd19zeW5jX2lvY3RsX2luYyhz dHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqb2JqLCB1bnNpZ25lZCBsb25nIGFyZykKIHN0YXRpYyBs b25nIHN3X3N5bmNfaW9jdGwoc3RydWN0IGZpbGUgKmZpbGUsIHVuc2lnbmVkIGludCBjbWQsCiAJ CQkgIHVuc2lnbmVkIGxvbmcgYXJnKQogewotCXN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmog PSBmaWxlLT5wcml2YXRlX2RhdGE7CisJc3RydWN0IGZlbmNlX3RpbWVsaW5lICpvYmogPSBmaWxl LT5wcml2YXRlX2RhdGE7CiAKIAlzd2l0Y2ggKGNtZCkgewogCWNhc2UgU1dfU1lOQ19JT0NfQ1JF QVRFX0ZFTkNFOgotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==