From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752836AbdATOpz (ORCPT ); Fri, 20 Jan 2017 09:45:55 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36097 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752185AbdATOpx (ORCPT ); Fri, 20 Jan 2017 09:45:53 -0500 From: Geliang Tang To: Ben Skeggs , David Airlie Cc: Geliang Tang , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau/client: use rb_entry() Date: Fri, 20 Jan 2017 22:36:56 +0800 Message-Id: <22da087ad757fafdb206fd0c57d286449302acdb.1484816560.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make the code clearer, use rb_entry() instead of container_of() to deal with rbtree. Signed-off-by: Geliang Tang --- drivers/gpu/drm/nouveau/nvkm/core/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/core/client.c b/drivers/gpu/drm/nouveau/nvkm/core/client.c index e194391..ab2ee14 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/client.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c @@ -221,7 +221,7 @@ nvkm_client_insert(struct nvkm_client *client, struct nvkm_object *object) while (*ptr) { struct nvkm_object *this = - container_of(*ptr, typeof(*this), node); + rb_entry(*ptr, typeof(*this), node); parent = *ptr; if (object->object < this->object) ptr = &parent->rb_left; @@ -243,7 +243,7 @@ nvkm_client_search(struct nvkm_client *client, u64 handle) struct rb_node *node = client->objroot.rb_node; while (node) { struct nvkm_object *object = - container_of(node, typeof(*object), node); + rb_entry(node, typeof(*object), node); if (handle < object->object) node = node->rb_left; else -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geliang Tang Subject: [PATCH] drm/nouveau/client: use rb_entry() Date: Fri, 20 Jan 2017 22:36:56 +0800 Message-ID: <22da087ad757fafdb206fd0c57d286449302acdb.1484816560.git.geliangtang@gmail.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ben Skeggs , David Airlie Cc: Geliang Tang , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org VG8gbWFrZSB0aGUgY29kZSBjbGVhcmVyLCB1c2UgcmJfZW50cnkoKSBpbnN0ZWFkIG9mIGNvbnRh aW5lcl9vZigpIHRvCmRlYWwgd2l0aCByYnRyZWUuCgpTaWduZWQtb2ZmLWJ5OiBHZWxpYW5nIFRh bmcgPGdlbGlhbmd0YW5nQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9u dmttL2NvcmUvY2xpZW50LmMgfCA0ICsrLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bnZrbS9jb3JlL2NsaWVudC5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9jb3JlL2Ns aWVudC5jCmluZGV4IGUxOTQzOTEuLmFiMmVlMTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L252a20vY29yZS9jbGllbnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9udmttL2NvcmUvY2xpZW50LmMKQEAgLTIyMSw3ICsyMjEsNyBAQCBudmttX2NsaWVudF9pbnNl cnQoc3RydWN0IG52a21fY2xpZW50ICpjbGllbnQsIHN0cnVjdCBudmttX29iamVjdCAqb2JqZWN0 KQogCiAJd2hpbGUgKCpwdHIpIHsKIAkJc3RydWN0IG52a21fb2JqZWN0ICp0aGlzID0KLQkJCWNv bnRhaW5lcl9vZigqcHRyLCB0eXBlb2YoKnRoaXMpLCBub2RlKTsKKwkJCXJiX2VudHJ5KCpwdHIs IHR5cGVvZigqdGhpcyksIG5vZGUpOwogCQlwYXJlbnQgPSAqcHRyOwogCQlpZiAob2JqZWN0LT5v YmplY3QgPCB0aGlzLT5vYmplY3QpCiAJCQlwdHIgPSAmcGFyZW50LT5yYl9sZWZ0OwpAQCAtMjQz LDcgKzI0Myw3IEBAIG52a21fY2xpZW50X3NlYXJjaChzdHJ1Y3QgbnZrbV9jbGllbnQgKmNsaWVu dCwgdTY0IGhhbmRsZSkKIAlzdHJ1Y3QgcmJfbm9kZSAqbm9kZSA9IGNsaWVudC0+b2Jqcm9vdC5y Yl9ub2RlOwogCXdoaWxlIChub2RlKSB7CiAJCXN0cnVjdCBudmttX29iamVjdCAqb2JqZWN0ID0K LQkJCWNvbnRhaW5lcl9vZihub2RlLCB0eXBlb2YoKm9iamVjdCksIG5vZGUpOworCQkJcmJfZW50 cnkobm9kZSwgdHlwZW9mKCpvYmplY3QpLCBub2RlKTsKIAkJaWYgKGhhbmRsZSA8IG9iamVjdC0+ b2JqZWN0KQogCQkJbm9kZSA9IG5vZGUtPnJiX2xlZnQ7CiAJCWVsc2UKLS0gCjIuOS4zCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxp bmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK