[PATCH 104/156] drm/nouveau/nvif: remove conn from object rb

[Ben Skeggs]

- no more users

Signed-off-by: Ben Skeggs <bske...@nvidia.com>
---
 drivers/gpu/drm/nouveau/include/nvif/driverif.h  | 3 +--
 drivers/gpu/drm/nouveau/nvif/conn.c              | 3 +--
 drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h 
b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index 489f50d6ee00..e59d2a4ec4d0 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -255,8 +255,7 @@ struct nvif_disp_impl {
        struct {
                u32 mask;
                int (*new)(struct nvif_disp_priv *, u8 id,
-                          const struct nvif_conn_impl **, struct 
nvif_conn_priv **,
-                          u64 handle);
+                          const struct nvif_conn_impl **, struct 
nvif_conn_priv **);
        } conn;
 
        struct {
diff --git a/drivers/gpu/drm/nouveau/nvif/conn.c 
b/drivers/gpu/drm/nouveau/nvif/conn.c
index d4e9f0275d1e..8894f65d6028 100644
--- a/drivers/gpu/drm/nouveau/nvif/conn.c
+++ b/drivers/gpu/drm/nouveau/nvif/conn.c
@@ -57,8 +57,7 @@ nvif_conn_ctor(struct nvif_disp *disp, const char *name, int 
id, struct nvif_con
 {
        int ret;
 
-       ret = disp->impl->conn.new(disp->priv, id, &conn->impl, &conn->priv,
-                                  nvif_handle(&conn->object));
+       ret = disp->impl->conn.new(disp->priv, id, &conn->impl, &conn->priv);
        NVIF_ERRON(ret, &disp->object, "[NEW conn id:%d]", id);
        if (ret)
                return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c 
b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
index 01333ded466b..65e8b3fec655 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/udisp.c
@@ -92,8 +92,7 @@ nvkm_udisp_sclass(struct nvkm_object *object, int index, 
struct nvkm_oclass *scl
 
 static int
 nvkm_udisp_conn_new(struct nvif_disp_priv *udisp, u8 id,
-                   const struct nvif_conn_impl **pimpl, struct nvif_conn_priv 
**ppriv,
-                   u64 handle)
+                   const struct nvif_conn_impl **pimpl, struct nvif_conn_priv 
**ppriv)
 {
        struct nvkm_object *object;
        int ret;
@@ -102,7 +101,8 @@ nvkm_udisp_conn_new(struct nvif_disp_priv *udisp, u8 id,
        if (ret)
                return ret;
 
-       return nvkm_object_link_rb(udisp->object.client, &udisp->object, 
handle, object);
+       nvkm_object_link(&udisp->object, object);
+       return 0;
 }
 
 static int
-- 
2.41.0