[PATCH 131/156] drm/nouveau/nvif: remove disp 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/disp.c             | 3 +--
 drivers/gpu/drm/nouveau/nvkm/device/user.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 60a3529a6594..d317fcd29091 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -484,8 +484,7 @@ struct nvif_device_impl {
        struct {
                s32 oclass;
                int (*new)(struct nvif_device_priv *,
-                          const struct nvif_disp_impl **, struct 
nvif_disp_priv **,
-                          u64 handle);
+                          const struct nvif_disp_impl **, struct 
nvif_disp_priv **);
        } disp;
 
        struct nvif_device_impl_fifo {
diff --git a/drivers/gpu/drm/nouveau/nvif/disp.c 
b/drivers/gpu/drm/nouveau/nvif/disp.c
index d2824e4d29f8..b0c4fae39b18 100644
--- a/drivers/gpu/drm/nouveau/nvif/disp.c
+++ b/drivers/gpu/drm/nouveau/nvif/disp.c
@@ -97,8 +97,7 @@ nvif_disp_ctor(struct nvif_device *device, const char *name, 
struct nvif_disp *d
                return -ENODEV;
        }
 
-       ret = device->impl->disp.new(device->priv, &disp->impl, &disp->priv,
-                                    nvif_handle(&disp->object));
+       ret = device->impl->disp.new(device->priv, &disp->impl, &disp->priv);
        NVIF_ERRON(ret, &device->object, "[NEW disp%04x]", oclass);
        if (ret)
                return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/device/user.c 
b/drivers/gpu/drm/nouveau/nvkm/device/user.c
index 3c7c0d1e6adb..6a3b41004abd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/user.c
@@ -96,8 +96,7 @@ nvkm_udevice_time(struct nvif_device_priv *udev)
 
 static int
 nvkm_udevice_disp_new(struct nvif_device_priv *udev,
-                     const struct nvif_disp_impl **pimpl, struct 
nvif_disp_priv **ppriv,
-                     u64 handle)
+                     const struct nvif_disp_impl **pimpl, struct 
nvif_disp_priv **ppriv)
 {
        struct nvkm_object *object;
        int ret;
@@ -106,7 +105,8 @@ nvkm_udevice_disp_new(struct nvif_device_priv *udev,
        if (ret)
                return ret;
 
-       return nvkm_object_link_rb(udev->object.client, &udev->object, handle, 
object);
+       nvkm_object_link(&udev->object, object);
+       return 0;
 }
 
 static int
-- 
2.41.0