drm/nouveau/dma: use rb_entry()

To make the code clearer, use rb_entry() instead of container_of() to
deal with rbtree.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
index f11ebdd16c77f0a8516d01336bef6837f660eea6..4655d1750b9518135882e7de79111b3cd3a9f16e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c
@@ -34,7 +34,7 @@ nvkm_dma_search(struct nvkm_dma *dma, struct nvkm_client *client, u64 object)
        struct rb_node *node = client->dmaroot.rb_node;
        while (node) {
                struct nvkm_dmaobj *dmaobj =
-                       container_of(node, typeof(*dmaobj), rb);
+                       rb_entry(node, typeof(*dmaobj), rb);
                if (object < dmaobj->handle)
                        node = node->rb_left;
                else
@@ -67,7 +67,7 @@ nvkm_dma_oclass_new(struct nvkm_device *device,
        dmaobj->handle = oclass->object;
 
        while (*ptr) {
-               struct nvkm_dmaobj *obj = container_of(*ptr, typeof(*obj), rb);
+               struct nvkm_dmaobj *obj = rb_entry(*ptr, typeof(*obj), rb);
                parent = *ptr;
                if (dmaobj->handle < obj->handle)
                        ptr = &parent->rb_left;