[PATCH 140/156] drm/nouveau/nvif: remove device 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/device.c           | 3 +--
 drivers/gpu/drm/nouveau/nvkm/core/client.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 fac23a6ddc6d..7dd2b187e6d6 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -609,8 +609,7 @@ struct nvif_client_impl {
 
        struct {
                int (*new)(struct nvif_client_priv *,
-                          const struct nvif_device_impl **, struct 
nvif_device_priv **,
-                          u64 handle);
+                          const struct nvif_device_impl **, struct 
nvif_device_priv **);
        } device;
 };
 #endif
diff --git a/drivers/gpu/drm/nouveau/nvif/device.c 
b/drivers/gpu/drm/nouveau/nvif/device.c
index 40bb0dd518e9..480034b5563b 100644
--- a/drivers/gpu/drm/nouveau/nvif/device.c
+++ b/drivers/gpu/drm/nouveau/nvif/device.c
@@ -78,8 +78,7 @@ nvif_device_ctor(struct nvif_client *client, const char 
*name, struct nvif_devic
 
        device->user.func = NULL;
 
-       ret = client->impl->device.new(client->priv, &device->impl, 
&device->priv,
-                                      nvif_handle(&device->object));
+       ret = client->impl->device.new(client->priv, &device->impl, 
&device->priv);
        NVIF_ERRON(ret, &client->object, "[NEW device]");
        if (ret)
                return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/client.c 
b/drivers/gpu/drm/nouveau/nvkm/core/client.c
index a77014b342c0..bcd375a8bc2a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/client.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c
@@ -33,8 +33,7 @@
 
 static int
 nvkm_client_new_device(struct nvif_client_priv *client,
-                      const struct nvif_device_impl **pimpl, struct 
nvif_device_priv **ppriv,
-                      u64 handle)
+                      const struct nvif_device_impl **pimpl, struct 
nvif_device_priv **ppriv)
 {
        struct nvkm_object *object;
        int ret;
@@ -43,7 +42,8 @@ nvkm_client_new_device(struct nvif_client_priv *client,
        if (ret)
                return ret;
 
-       return nvkm_object_link_rb(client, &client->object, handle, object);
+       nvkm_object_link_(client, &client->object, object);
+       return 0;
 }
 
 static int
-- 
2.41.0