[PATCH 074/156] drm/nouveau/nvif: remove ctrl 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/nouveau_debugfs.c       | 2 +-
 drivers/gpu/drm/nouveau/nvkm/device/user.c      | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/include/nvif/driverif.h 
b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
index e22e0347f623..05d69ea0f002 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -112,8 +112,7 @@ struct nvif_device_impl {
 
        struct {
                int (*new)(struct nvif_device_priv *,
-                          const struct nvif_control_impl **, struct 
nvif_control_priv **,
-                          u64 handle);
+                          const struct nvif_control_impl **, struct 
nvif_control_priv **);
        } control;
 
        struct {
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c 
b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index 837653ca1753..0c744a72aff2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -293,7 +293,7 @@ nouveau_debugfs_init(struct nouveau_drm *drm)
                return -ENOMEM;
 
        ret = drm->device.impl->control.new(drm->device.priv, 
&drm->debugfs->impl,
-                                           &drm->debugfs->priv, 
nvif_handle(&drm->debugfs->ctrl));
+                                           &drm->debugfs->priv);
        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 14d548c3f6b0..97d54b812165 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/user.c
@@ -41,8 +41,7 @@ struct nvif_device_priv {
 
 static int
 nvkm_udevice_control_new(struct nvif_device_priv *udev,
-                        const struct nvif_control_impl **pimpl, struct 
nvif_control_priv **ppriv,
-                        u64 handle)
+                        const struct nvif_control_impl **pimpl, struct 
nvif_control_priv **ppriv)
 {
        struct nvkm_object *object;
        int ret;
@@ -51,7 +50,8 @@ nvkm_udevice_control_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 u64
-- 
2.41.0