From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754704AbcAOO42 (ORCPT ); Fri, 15 Jan 2016 09:56:28 -0500 Received: from mail-yk0-f172.google.com ([209.85.160.172]:33513 "EHLO mail-yk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754636AbcAOO4W (ORCPT ); Fri, 15 Jan 2016 09:56:22 -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 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Date: Fri, 15 Jan 2016 12:55:20 -0200 Message-Id: <1452869739-3304-11-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 'sync_pt' is actually declared as struct fence so to make the name means its type we rename it to 'fence'. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sync.c | 20 ++++++++++---------- drivers/staging/android/sync.h | 2 +- drivers/staging/android/sync_debug.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c47b68d..decff9e 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -197,7 +197,7 @@ struct sync_fence *sync_fence_create_dma(const char *name, struct fence *pt) sync_fence->num_fences = 1; atomic_set(&sync_fence->status, 1); - sync_fence->cbs[0].sync_pt = pt; + sync_fence->cbs[0].fence = pt; sync_fence->cbs[0].sync_fence = sync_fence; if (fence_add_callback(pt, &sync_fence->cbs[0].cb, fence_check_cb_func)) atomic_dec(&sync_fence->status); @@ -247,7 +247,7 @@ EXPORT_SYMBOL(sync_fence_install); static void sync_fence_add_pt(struct sync_fence *sync_fence, int *i, struct fence *pt) { - sync_fence->cbs[*i].sync_pt = pt; + sync_fence->cbs[*i].fence = pt; sync_fence->cbs[*i].sync_fence = sync_fence; if (!fence_add_callback(pt, &sync_fence->cbs[*i].cb, @@ -279,8 +279,8 @@ struct sync_fence *sync_fence_merge(const char *name, * and sync_fence_create, this is a reasonable assumption. */ for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) { - struct fence *pt_a = a->cbs[i_a].sync_pt; - struct fence *pt_b = b->cbs[i_b].sync_pt; + struct fence *pt_a = a->cbs[i_a].fence; + struct fence *pt_b = b->cbs[i_b].fence; if (pt_a->context < pt_b->context) { sync_fence_add_pt(sync_fence, &i, pt_a); @@ -302,10 +302,10 @@ struct sync_fence *sync_fence_merge(const char *name, } for (; i_a < a->num_fences; i_a++) - sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].sync_pt); + sync_fence_add_pt(sync_fence, &i, a->cbs[i_a].fence); for (; i_b < b->num_fences; i_b++) - sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].sync_pt); + sync_fence_add_pt(sync_fence, &i, b->cbs[i_b].fence); if (num_fences > i) atomic_sub(num_fences - i, &sync_fence->status); @@ -384,7 +384,7 @@ int sync_fence_wait(struct sync_fence *sync_fence, long timeout) trace_sync_wait(sync_fence, 1); for (i = 0; i < sync_fence->num_fences; ++i) - trace_sync_pt(sync_fence->cbs[i].sync_pt); + trace_sync_pt(sync_fence->cbs[i].fence); ret = wait_event_interruptible_timeout(sync_fence->wq, atomic_read(&sync_fence->status) <= 0, timeout); @@ -525,9 +525,9 @@ static void sync_fence_free(struct kref *kref) int i; for (i = 0; i < sync_fence->num_fences; ++i) { - fence_remove_callback(sync_fence->cbs[i].sync_pt, + fence_remove_callback(sync_fence->cbs[i].fence, &sync_fence->cbs[i].cb); - fence_put(sync_fence->cbs[i].sync_pt); + fence_put(sync_fence->cbs[i].fence); } kfree(sync_fence); @@ -681,7 +681,7 @@ static long sync_fence_ioctl_fence_info(struct sync_fence *sync_fence, len = sizeof(struct sync_fence_info_data); for (i = 0; i < sync_fence->num_fences; ++i) { - struct fence *pt = sync_fence->cbs[i].sync_pt; + struct fence *pt = sync_fence->cbs[i].fence; ret = sync_fill_pt_info(pt, (u8 *)data + len, size - len); diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index 0fed642..43f72a7 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -110,7 +110,7 @@ static inline struct sync_timeline *sync_pt_parent(struct sync_pt *pt) struct sync_fence_cb { struct fence_cb cb; - struct fence *sync_pt; + struct fence *fence; struct sync_fence *sync_fence; }; diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index cfa92d2..78e9147 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -163,7 +163,7 @@ static void sync_print_sync_fence(struct seq_file *s, sync_status_str(atomic_read(&sync_fence->status))); for (i = 0; i < sync_fence->num_fences; ++i) { - sync_print_pt(s, sync_fence->cbs[i].sync_pt, true); + sync_print_pt(s, sync_fence->cbs[i].fence, true); } spin_lock_irqsave(&sync_fence->wq.lock, flags); -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [RFC 10/29] staging/android: rename 'sync_pt' to 'fence' in struct sync_fence_cb Date: Fri, 15 Jan 2016 12:55:20 -0200 Message-ID: <1452869739-3304-11-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-f176.google.com (mail-yk0-f176.google.com [209.85.160.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id 797CE7A0EA for ; Fri, 15 Jan 2016 06:56:22 -0800 (PST) Received: by mail-yk0-f176.google.com with SMTP id x67so546602664ykd.2 for ; Fri, 15 Jan 2016 06:56:22 -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 J3N5bmNfcHQnIGlzIGFjdHVhbGx5IGRlY2xhcmVkIGFzIHN0cnVjdCBmZW5jZSBzbyB0byBtYWtl IHRoZSBuYW1lIG1lYW5zCml0cyB0eXBlIHdlIHJlbmFtZSBpdCB0byAnZmVuY2UnLgoKU2lnbmVk LW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVr PgotLS0KIGRyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYyAgICAgICB8IDIwICsrKysrKysr KystLS0tLS0tLS0tCiBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmggICAgICAgfCAgMiAr LQogZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jIHwgIDIgKy0KIDMgZmlsZXMg Y2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3luYy5jCmluZGV4IGM0N2I2OGQuLmRlY2ZmOWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL3N5bmMuYworKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKQEAg LTE5Nyw3ICsxOTcsNyBAQCBzdHJ1Y3Qgc3luY19mZW5jZSAqc3luY19mZW5jZV9jcmVhdGVfZG1h KGNvbnN0IGNoYXIgKm5hbWUsIHN0cnVjdCBmZW5jZSAqcHQpCiAJc3luY19mZW5jZS0+bnVtX2Zl bmNlcyA9IDE7CiAJYXRvbWljX3NldCgmc3luY19mZW5jZS0+c3RhdHVzLCAxKTsKIAotCXN5bmNf ZmVuY2UtPmNic1swXS5zeW5jX3B0ID0gcHQ7CisJc3luY19mZW5jZS0+Y2JzWzBdLmZlbmNlID0g cHQ7CiAJc3luY19mZW5jZS0+Y2JzWzBdLnN5bmNfZmVuY2UgPSBzeW5jX2ZlbmNlOwogCWlmIChm ZW5jZV9hZGRfY2FsbGJhY2socHQsICZzeW5jX2ZlbmNlLT5jYnNbMF0uY2IsIGZlbmNlX2NoZWNr X2NiX2Z1bmMpKQogCQlhdG9taWNfZGVjKCZzeW5jX2ZlbmNlLT5zdGF0dXMpOwpAQCAtMjQ3LDcg KzI0Nyw3IEBAIEVYUE9SVF9TWU1CT0woc3luY19mZW5jZV9pbnN0YWxsKTsKIHN0YXRpYyB2b2lk IHN5bmNfZmVuY2VfYWRkX3B0KHN0cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNlLAogCQkJICAg ICAgaW50ICppLCBzdHJ1Y3QgZmVuY2UgKnB0KQogewotCXN5bmNfZmVuY2UtPmNic1sqaV0uc3lu Y19wdCA9IHB0OworCXN5bmNfZmVuY2UtPmNic1sqaV0uZmVuY2UgPSBwdDsKIAlzeW5jX2ZlbmNl LT5jYnNbKmldLnN5bmNfZmVuY2UgPSBzeW5jX2ZlbmNlOwogCiAJaWYgKCFmZW5jZV9hZGRfY2Fs bGJhY2socHQsICZzeW5jX2ZlbmNlLT5jYnNbKmldLmNiLApAQCAtMjc5LDggKzI3OSw4IEBAIHN0 cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNlX21lcmdlKGNvbnN0IGNoYXIgKm5hbWUsCiAJICog YW5kIHN5bmNfZmVuY2VfY3JlYXRlLCB0aGlzIGlzIGEgcmVhc29uYWJsZSBhc3N1bXB0aW9uLgog CSAqLwogCWZvciAoaSA9IGlfYSA9IGlfYiA9IDA7IGlfYSA8IGEtPm51bV9mZW5jZXMgJiYgaV9i IDwgYi0+bnVtX2ZlbmNlczsgKSB7Ci0JCXN0cnVjdCBmZW5jZSAqcHRfYSA9IGEtPmNic1tpX2Fd LnN5bmNfcHQ7Ci0JCXN0cnVjdCBmZW5jZSAqcHRfYiA9IGItPmNic1tpX2JdLnN5bmNfcHQ7CisJ CXN0cnVjdCBmZW5jZSAqcHRfYSA9IGEtPmNic1tpX2FdLmZlbmNlOworCQlzdHJ1Y3QgZmVuY2Ug KnB0X2IgPSBiLT5jYnNbaV9iXS5mZW5jZTsKIAogCQlpZiAocHRfYS0+Y29udGV4dCA8IHB0X2It PmNvbnRleHQpIHsKIAkJCXN5bmNfZmVuY2VfYWRkX3B0KHN5bmNfZmVuY2UsICZpLCBwdF9hKTsK QEAgLTMwMiwxMCArMzAyLDEwIEBAIHN0cnVjdCBzeW5jX2ZlbmNlICpzeW5jX2ZlbmNlX21lcmdl KGNvbnN0IGNoYXIgKm5hbWUsCiAJfQogCiAJZm9yICg7IGlfYSA8IGEtPm51bV9mZW5jZXM7IGlf YSsrKQotCQlzeW5jX2ZlbmNlX2FkZF9wdChzeW5jX2ZlbmNlLCAmaSwgYS0+Y2JzW2lfYV0uc3lu Y19wdCk7CisJCXN5bmNfZmVuY2VfYWRkX3B0KHN5bmNfZmVuY2UsICZpLCBhLT5jYnNbaV9hXS5m ZW5jZSk7CiAKIAlmb3IgKDsgaV9iIDwgYi0+bnVtX2ZlbmNlczsgaV9iKyspCi0JCXN5bmNfZmVu Y2VfYWRkX3B0KHN5bmNfZmVuY2UsICZpLCBiLT5jYnNbaV9iXS5zeW5jX3B0KTsKKwkJc3luY19m ZW5jZV9hZGRfcHQoc3luY19mZW5jZSwgJmksIGItPmNic1tpX2JdLmZlbmNlKTsKIAogCWlmIChu dW1fZmVuY2VzID4gaSkKIAkJYXRvbWljX3N1YihudW1fZmVuY2VzIC0gaSwgJnN5bmNfZmVuY2Ut PnN0YXR1cyk7CkBAIC0zODQsNyArMzg0LDcgQEAgaW50IHN5bmNfZmVuY2Vfd2FpdChzdHJ1Y3Qg c3luY19mZW5jZSAqc3luY19mZW5jZSwgbG9uZyB0aW1lb3V0KQogCiAJdHJhY2Vfc3luY193YWl0 KHN5bmNfZmVuY2UsIDEpOwogCWZvciAoaSA9IDA7IGkgPCBzeW5jX2ZlbmNlLT5udW1fZmVuY2Vz OyArK2kpCi0JCXRyYWNlX3N5bmNfcHQoc3luY19mZW5jZS0+Y2JzW2ldLnN5bmNfcHQpOworCQl0 cmFjZV9zeW5jX3B0KHN5bmNfZmVuY2UtPmNic1tpXS5mZW5jZSk7CiAJcmV0ID0gd2FpdF9ldmVu dF9pbnRlcnJ1cHRpYmxlX3RpbWVvdXQoc3luY19mZW5jZS0+d3EsCiAJCQkJCSAgICAgICBhdG9t aWNfcmVhZCgmc3luY19mZW5jZS0+c3RhdHVzKSA8PSAwLAogCQkJCQkgICAgICAgdGltZW91dCk7 CkBAIC01MjUsOSArNTI1LDkgQEAgc3RhdGljIHZvaWQgc3luY19mZW5jZV9mcmVlKHN0cnVjdCBr cmVmICprcmVmKQogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IHN5bmNfZmVuY2UtPm51bV9m ZW5jZXM7ICsraSkgewotCQlmZW5jZV9yZW1vdmVfY2FsbGJhY2soc3luY19mZW5jZS0+Y2JzW2ld LnN5bmNfcHQsCisJCWZlbmNlX3JlbW92ZV9jYWxsYmFjayhzeW5jX2ZlbmNlLT5jYnNbaV0uZmVu Y2UsCiAJCQkJICAgICAgJnN5bmNfZmVuY2UtPmNic1tpXS5jYik7Ci0JCWZlbmNlX3B1dChzeW5j X2ZlbmNlLT5jYnNbaV0uc3luY19wdCk7CisJCWZlbmNlX3B1dChzeW5jX2ZlbmNlLT5jYnNbaV0u ZmVuY2UpOwogCX0KIAogCWtmcmVlKHN5bmNfZmVuY2UpOwpAQCAtNjgxLDcgKzY4MSw3IEBAIHN0 YXRpYyBsb25nIHN5bmNfZmVuY2VfaW9jdGxfZmVuY2VfaW5mbyhzdHJ1Y3Qgc3luY19mZW5jZSAq c3luY19mZW5jZSwKIAlsZW4gPSBzaXplb2Yoc3RydWN0IHN5bmNfZmVuY2VfaW5mb19kYXRhKTsK IAogCWZvciAoaSA9IDA7IGkgPCBzeW5jX2ZlbmNlLT5udW1fZmVuY2VzOyArK2kpIHsKLQkJc3Ry dWN0IGZlbmNlICpwdCA9IHN5bmNfZmVuY2UtPmNic1tpXS5zeW5jX3B0OworCQlzdHJ1Y3QgZmVu Y2UgKnB0ID0gc3luY19mZW5jZS0+Y2JzW2ldLmZlbmNlOwogCiAJCXJldCA9IHN5bmNfZmlsbF9w dF9pbmZvKHB0LCAodTggKilkYXRhICsgbGVuLCBzaXplIC0gbGVuKTsKIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5oIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3luYy5oCmluZGV4IDBmZWQ2NDIuLjQzZjcyYTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2lu Zy9hbmRyb2lkL3N5bmMuaAorKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmgKQEAg LTExMCw3ICsxMTAsNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBzeW5jX3RpbWVsaW5lICpzeW5j X3B0X3BhcmVudChzdHJ1Y3Qgc3luY19wdCAqcHQpCiAKIHN0cnVjdCBzeW5jX2ZlbmNlX2NiIHsK IAlzdHJ1Y3QgZmVuY2VfY2IgY2I7Ci0Jc3RydWN0IGZlbmNlICpzeW5jX3B0OworCXN0cnVjdCBm ZW5jZSAqZmVuY2U7CiAJc3RydWN0IHN5bmNfZmVuY2UgKnN5bmNfZmVuY2U7CiB9OwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMgYi9kcml2ZXJzL3N0 YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMKaW5kZXggY2ZhOTJkMi4uNzhlOTE0NyAxMDA2NDQK LS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jCisrKyBiL2RyaXZlcnMv c3RhZ2luZy9hbmRyb2lkL3N5bmNfZGVidWcuYwpAQCAtMTYzLDcgKzE2Myw3IEBAIHN0YXRpYyB2 b2lkIHN5bmNfcHJpbnRfc3luY19mZW5jZShzdHJ1Y3Qgc2VxX2ZpbGUgKnMsCiAJCSAgIHN5bmNf c3RhdHVzX3N0cihhdG9taWNfcmVhZCgmc3luY19mZW5jZS0+c3RhdHVzKSkpOwogCiAJZm9yIChp ID0gMDsgaSA8IHN5bmNfZmVuY2UtPm51bV9mZW5jZXM7ICsraSkgewotCQlzeW5jX3ByaW50X3B0 KHMsIHN5bmNfZmVuY2UtPmNic1tpXS5zeW5jX3B0LCB0cnVlKTsKKwkJc3luY19wcmludF9wdChz LCBzeW5jX2ZlbmNlLT5jYnNbaV0uZmVuY2UsIHRydWUpOwogCX0KIAogCXNwaW5fbG9ja19pcnFz YXZlKCZzeW5jX2ZlbmNlLT53cS5sb2NrLCBmbGFncyk7Ci0tIAoyLjUuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK