From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754075AbcAOPCv (ORCPT ); Fri, 15 Jan 2016 10:02:51 -0500 Received: from mail-yk0-f171.google.com ([209.85.160.171]:34614 "EHLO mail-yk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754487AbcAOO4D (ORCPT ); Fri, 15 Jan 2016 09:56:03 -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 05/29] staging/android: remove not used sync_timeline ops Date: Fri, 15 Jan 2016 12:55:15 -0200 Message-Id: <1452869739-3304-6-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 .dup and .compare are not used by the sync framework, so remove them from sw_sync. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sw_sync.c | 29 +---------------------------- drivers/staging/android/sync.c | 6 ------ drivers/staging/android/sync.h | 19 ------------------- 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index c4ff167..566dcdc 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -25,14 +25,6 @@ #include "sw_sync.h" -static int sw_sync_cmp(u32 a, u32 b) -{ - if (a == b) - return 0; - - return ((s32)a - (s32)b) < 0 ? -1 : 1; -} - struct sync_pt *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) { struct sw_sync_pt *pt; @@ -46,30 +38,13 @@ struct sync_pt *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) } EXPORT_SYMBOL(sw_sync_pt_create); -static struct sync_pt *sw_sync_pt_dup(struct sync_pt *sync_pt) -{ - struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt; - struct sw_sync_timeline *obj = - (struct sw_sync_timeline *)sync_pt_parent(sync_pt); - - return (struct sync_pt *)sw_sync_pt_create(obj, pt->value); -} - static int sw_sync_pt_has_signaled(struct sync_pt *sync_pt) { struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt; struct sw_sync_timeline *obj = (struct sw_sync_timeline *)sync_pt_parent(sync_pt); - return sw_sync_cmp(obj->value, pt->value) >= 0; -} - -static int sw_sync_pt_compare(struct sync_pt *a, struct sync_pt *b) -{ - struct sw_sync_pt *pt_a = (struct sw_sync_pt *)a; - struct sw_sync_pt *pt_b = (struct sw_sync_pt *)b; - - return sw_sync_cmp(pt_a->value, pt_b->value); + return (pt->value > obj->value) ? 0 : 1; } static int sw_sync_fill_driver_data(struct sync_pt *sync_pt, @@ -103,9 +78,7 @@ static void sw_sync_pt_value_str(struct sync_pt *sync_pt, static struct sync_timeline_ops sw_sync_timeline_ops = { .driver_name = "sw_sync", - .dup = sw_sync_pt_dup, .has_signaled = sw_sync_pt_has_signaled, - .compare = sw_sync_pt_compare, .fill_driver_data = sw_sync_fill_driver_data, .timeline_value_str = sw_sync_timeline_value_str, .pt_value_str = sw_sync_pt_value_str, diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index fa756ef..5028847 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -68,9 +68,6 @@ static void sync_timeline_free(struct kref *kref) sync_timeline_debug_remove(obj); - if (obj->ops->release_obj) - obj->ops->release_obj(obj); - kfree(obj); } @@ -439,9 +436,6 @@ static void sync_fence_release(struct fence *fence) list_del(&pt->active_list); spin_unlock_irqrestore(fence->lock, flags); - if (parent->ops->free_pt) - parent->ops->free_pt(pt); - sync_timeline_put(parent); fence_free(&pt->base); } diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index f3d4f75..ad45659 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -30,17 +30,10 @@ struct sync_fence; /** * struct sync_timeline_ops - sync object implementation ops * @driver_name: name of the implementation - * @dup: duplicate a sync_pt * @has_signaled: returns: * 1 if pt has signaled * 0 if pt has not signaled * <0 on error - * @compare: returns: - * 1 if b will signal before a - * 0 if a and b will signal at the same time - * -1 if a will signal before b - * @free_pt: called before sync_pt is freed - * @release_obj: called before sync_timeline is freed * @fill_driver_data: write implementation specific driver data to data. * should return an error if there is not enough room * as specified by size. This information is returned @@ -52,20 +45,8 @@ struct sync_timeline_ops { const char *driver_name; /* required */ - struct sync_pt * (*dup)(struct sync_pt *pt); - - /* required */ int (*has_signaled)(struct sync_pt *pt); - /* required */ - int (*compare)(struct sync_pt *a, struct sync_pt *b); - - /* optional */ - void (*free_pt)(struct sync_pt *sync_pt); - - /* optional */ - void (*release_obj)(struct sync_timeline *sync_timeline); - /* optional */ int (*fill_driver_data)(struct sync_pt *syncpt, void *data, int size); -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 05/29] staging/android: remove not used sync_timeline ops Date: Fri, 15 Jan 2016 12:55:15 -0200 Message-ID: <1452869739-3304-6-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-f182.google.com (mail-yk0-f182.google.com [209.85.160.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A3417A0DC for ; Fri, 15 Jan 2016 06:56:03 -0800 (PST) Received: by mail-yk0-f182.google.com with SMTP id k129so522498370yke.0 for ; Fri, 15 Jan 2016 06:56:03 -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 LmR1cCBhbmQgLmNvbXBhcmUgYXJlIG5vdCB1c2VkIGJ5IHRoZSBzeW5jIGZyYW1ld29yaywgc28g cmVtb3ZlIHRoZW0KZnJvbSBzd19zeW5jLgoKU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFu IDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgotLS0KIGRyaXZlcnMvc3RhZ2luZy9h bmRyb2lkL3N3X3N5bmMuYyB8IDI5ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMgICAgfCAgNiAtLS0tLS0KIGRyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL3N5bmMuaCAgICB8IDE5IC0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hh bmdlZCwgMSBpbnNlcnRpb24oKyksIDUzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvc3RhZ2luZy9hbmRyb2lkL3N3X3N5bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N3 X3N5bmMuYwppbmRleCBjNGZmMTY3Li41NjZkY2RjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdp bmcvYW5kcm9pZC9zd19zeW5jLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3lu Yy5jCkBAIC0yNSwxNCArMjUsNiBAQAogCiAjaW5jbHVkZSAic3dfc3luYy5oIgogCi1zdGF0aWMg aW50IHN3X3N5bmNfY21wKHUzMiBhLCB1MzIgYikKLXsKLQlpZiAoYSA9PSBiKQotCQlyZXR1cm4g MDsKLQotCXJldHVybiAoKHMzMilhIC0gKHMzMiliKSA8IDAgPyAtMSA6IDE7Ci19Ci0KIHN0cnVj dCBzeW5jX3B0ICpzd19zeW5jX3B0X2NyZWF0ZShzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqb2Jq LCB1MzIgdmFsdWUpCiB7CiAJc3RydWN0IHN3X3N5bmNfcHQgKnB0OwpAQCAtNDYsMzAgKzM4LDEz IEBAIHN0cnVjdCBzeW5jX3B0ICpzd19zeW5jX3B0X2NyZWF0ZShzdHJ1Y3Qgc3dfc3luY190aW1l bGluZSAqb2JqLCB1MzIgdmFsdWUpCiB9CiBFWFBPUlRfU1lNQk9MKHN3X3N5bmNfcHRfY3JlYXRl KTsKIAotc3RhdGljIHN0cnVjdCBzeW5jX3B0ICpzd19zeW5jX3B0X2R1cChzdHJ1Y3Qgc3luY19w dCAqc3luY19wdCkKLXsKLQlzdHJ1Y3Qgc3dfc3luY19wdCAqcHQgPSAoc3RydWN0IHN3X3N5bmNf cHQgKilzeW5jX3B0OwotCXN0cnVjdCBzd19zeW5jX3RpbWVsaW5lICpvYmogPQotCQkoc3RydWN0 IHN3X3N5bmNfdGltZWxpbmUgKilzeW5jX3B0X3BhcmVudChzeW5jX3B0KTsKLQotCXJldHVybiAo c3RydWN0IHN5bmNfcHQgKilzd19zeW5jX3B0X2NyZWF0ZShvYmosIHB0LT52YWx1ZSk7Ci19Ci0K IHN0YXRpYyBpbnQgc3dfc3luY19wdF9oYXNfc2lnbmFsZWQoc3RydWN0IHN5bmNfcHQgKnN5bmNf cHQpCiB7CiAJc3RydWN0IHN3X3N5bmNfcHQgKnB0ID0gKHN0cnVjdCBzd19zeW5jX3B0ICopc3lu Y19wdDsKIAlzdHJ1Y3Qgc3dfc3luY190aW1lbGluZSAqb2JqID0KIAkJKHN0cnVjdCBzd19zeW5j X3RpbWVsaW5lICopc3luY19wdF9wYXJlbnQoc3luY19wdCk7CiAKLQlyZXR1cm4gc3dfc3luY19j bXAob2JqLT52YWx1ZSwgcHQtPnZhbHVlKSA+PSAwOwotfQotCi1zdGF0aWMgaW50IHN3X3N5bmNf cHRfY29tcGFyZShzdHJ1Y3Qgc3luY19wdCAqYSwgc3RydWN0IHN5bmNfcHQgKmIpCi17Ci0Jc3Ry dWN0IHN3X3N5bmNfcHQgKnB0X2EgPSAoc3RydWN0IHN3X3N5bmNfcHQgKilhOwotCXN0cnVjdCBz d19zeW5jX3B0ICpwdF9iID0gKHN0cnVjdCBzd19zeW5jX3B0ICopYjsKLQotCXJldHVybiBzd19z eW5jX2NtcChwdF9hLT52YWx1ZSwgcHRfYi0+dmFsdWUpOworCXJldHVybiAocHQtPnZhbHVlID4g b2JqLT52YWx1ZSkgPyAwIDogMTsKIH0KIAogc3RhdGljIGludCBzd19zeW5jX2ZpbGxfZHJpdmVy X2RhdGEoc3RydWN0IHN5bmNfcHQgKnN5bmNfcHQsCkBAIC0xMDMsOSArNzgsNyBAQCBzdGF0aWMg dm9pZCBzd19zeW5jX3B0X3ZhbHVlX3N0cihzdHJ1Y3Qgc3luY19wdCAqc3luY19wdCwKIAogc3Rh dGljIHN0cnVjdCBzeW5jX3RpbWVsaW5lX29wcyBzd19zeW5jX3RpbWVsaW5lX29wcyA9IHsKIAku ZHJpdmVyX25hbWUgPSAic3dfc3luYyIsCi0JLmR1cCA9IHN3X3N5bmNfcHRfZHVwLAogCS5oYXNf c2lnbmFsZWQgPSBzd19zeW5jX3B0X2hhc19zaWduYWxlZCwKLQkuY29tcGFyZSA9IHN3X3N5bmNf cHRfY29tcGFyZSwKIAkuZmlsbF9kcml2ZXJfZGF0YSA9IHN3X3N5bmNfZmlsbF9kcml2ZXJfZGF0 YSwKIAkudGltZWxpbmVfdmFsdWVfc3RyID0gc3dfc3luY190aW1lbGluZV92YWx1ZV9zdHIsCiAJ LnB0X3ZhbHVlX3N0ciA9IHN3X3N5bmNfcHRfdmFsdWVfc3RyLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5j CmluZGV4IGZhNzU2ZWYuLjUwMjg4NDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRy b2lkL3N5bmMuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKQEAgLTY4LDkg KzY4LDYgQEAgc3RhdGljIHZvaWQgc3luY190aW1lbGluZV9mcmVlKHN0cnVjdCBrcmVmICprcmVm KQogCiAJc3luY190aW1lbGluZV9kZWJ1Z19yZW1vdmUob2JqKTsKIAotCWlmIChvYmotPm9wcy0+ cmVsZWFzZV9vYmopCi0JCW9iai0+b3BzLT5yZWxlYXNlX29iaihvYmopOwotCiAJa2ZyZWUob2Jq KTsKIH0KIApAQCAtNDM5LDkgKzQzNiw2IEBAIHN0YXRpYyB2b2lkIHN5bmNfZmVuY2VfcmVsZWFz ZShzdHJ1Y3QgZmVuY2UgKmZlbmNlKQogCQlsaXN0X2RlbCgmcHQtPmFjdGl2ZV9saXN0KTsKIAlz cGluX3VubG9ja19pcnFyZXN0b3JlKGZlbmNlLT5sb2NrLCBmbGFncyk7CiAKLQlpZiAocGFyZW50 LT5vcHMtPmZyZWVfcHQpCi0JCXBhcmVudC0+b3BzLT5mcmVlX3B0KHB0KTsKLQogCXN5bmNfdGlt ZWxpbmVfcHV0KHBhcmVudCk7CiAJZmVuY2VfZnJlZSgmcHQtPmJhc2UpOwogfQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5oIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJv aWQvc3luYy5oCmluZGV4IGYzZDRmNzUuLmFkNDU2NTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3Rh Z2luZy9hbmRyb2lkL3N5bmMuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmgK QEAgLTMwLDE3ICszMCwxMCBAQCBzdHJ1Y3Qgc3luY19mZW5jZTsKIC8qKgogICogc3RydWN0IHN5 bmNfdGltZWxpbmVfb3BzIC0gc3luYyBvYmplY3QgaW1wbGVtZW50YXRpb24gb3BzCiAgKiBAZHJp dmVyX25hbWU6CW5hbWUgb2YgdGhlIGltcGxlbWVudGF0aW9uCi0gKiBAZHVwOgkJZHVwbGljYXRl IGEgc3luY19wdAogICogQGhhc19zaWduYWxlZDoJcmV0dXJuczoKICAqCQkJICAxIGlmIHB0IGhh cyBzaWduYWxlZAogICoJCQkgIDAgaWYgcHQgaGFzIG5vdCBzaWduYWxlZAogICoJCQkgPDAgb24g ZXJyb3IKLSAqIEBjb21wYXJlOgkJcmV0dXJuczoKLSAqCQkJICAxIGlmIGIgd2lsbCBzaWduYWwg YmVmb3JlIGEKLSAqCQkJICAwIGlmIGEgYW5kIGIgd2lsbCBzaWduYWwgYXQgdGhlIHNhbWUgdGlt ZQotICoJCQkgLTEgaWYgYSB3aWxsIHNpZ25hbCBiZWZvcmUgYgotICogQGZyZWVfcHQ6CQljYWxs ZWQgYmVmb3JlIHN5bmNfcHQgaXMgZnJlZWQKLSAqIEByZWxlYXNlX29iajoJY2FsbGVkIGJlZm9y ZSBzeW5jX3RpbWVsaW5lIGlzIGZyZWVkCiAgKiBAZmlsbF9kcml2ZXJfZGF0YToJd3JpdGUgaW1w bGVtZW50YXRpb24gc3BlY2lmaWMgZHJpdmVyIGRhdGEgdG8gZGF0YS4KICAqCQkJICBzaG91bGQg cmV0dXJuIGFuIGVycm9yIGlmIHRoZXJlIGlzIG5vdCBlbm91Z2ggcm9vbQogICoJCQkgIGFzIHNw ZWNpZmllZCBieSBzaXplLiAgVGhpcyBpbmZvcm1hdGlvbiBpcyByZXR1cm5lZApAQCAtNTIsMjAg KzQ1LDggQEAgc3RydWN0IHN5bmNfdGltZWxpbmVfb3BzIHsKIAljb25zdCBjaGFyICpkcml2ZXJf bmFtZTsKIAogCS8qIHJlcXVpcmVkICovCi0Jc3RydWN0IHN5bmNfcHQgKiAoKmR1cCkoc3RydWN0 IHN5bmNfcHQgKnB0KTsKLQotCS8qIHJlcXVpcmVkICovCiAJaW50ICgqaGFzX3NpZ25hbGVkKShz dHJ1Y3Qgc3luY19wdCAqcHQpOwogCi0JLyogcmVxdWlyZWQgKi8KLQlpbnQgKCpjb21wYXJlKShz dHJ1Y3Qgc3luY19wdCAqYSwgc3RydWN0IHN5bmNfcHQgKmIpOwotCi0JLyogb3B0aW9uYWwgKi8K LQl2b2lkICgqZnJlZV9wdCkoc3RydWN0IHN5bmNfcHQgKnN5bmNfcHQpOwotCi0JLyogb3B0aW9u YWwgKi8KLQl2b2lkICgqcmVsZWFzZV9vYmopKHN0cnVjdCBzeW5jX3RpbWVsaW5lICpzeW5jX3Rp bWVsaW5lKTsKLQogCS8qIG9wdGlvbmFsICovCiAJaW50ICgqZmlsbF9kcml2ZXJfZGF0YSkoc3Ry dWN0IHN5bmNfcHQgKnN5bmNwdCwgdm9pZCAqZGF0YSwgaW50IHNpemUpOwogCi0tIAoyLjUuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK