[PATCH 098/156] drm/nouveau/nvif: remove fault buffer 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_svm.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 81375819c787..42e6324ddfe3 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -277,8 +277,7 @@ struct nvif_device_impl {
        struct {
                s32 oclass;
                int (*new)(struct nvif_device_priv *,
-                          const struct nvif_faultbuf_impl **, struct 
nvif_faultbuf_priv **,
-                          u64 handle);
+                          const struct nvif_faultbuf_impl **, struct 
nvif_faultbuf_priv **);
        } faultbuf;
 
        struct {
diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c 
b/drivers/gpu/drm/nouveau/nouveau_svm.c
index 382f886e4130..534448f82daa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -979,8 +979,7 @@ nouveau_svm_fault_buffer_ctor(struct nouveau_svm *svm, s32 
oclass, int id)
 
        buffer->id = id;
 
-       ret = drm->device.impl->faultbuf.new(drm->device.priv, &buffer->impl, 
&buffer->priv,
-                                            nvif_handle(&buffer->object));
+       ret = drm->device.impl->faultbuf.new(drm->device.priv, &buffer->impl, 
&buffer->priv);
        if (ret) {
                SVM_ERR(svm, "Fault buffer allocation failed: %d", ret);
                return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/device/user.c 
b/drivers/gpu/drm/nouveau/nvkm/device/user.c
index b4604ce1fcbb..eb33ab81d7e1 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/user.c
@@ -44,8 +44,7 @@ struct nvif_device_priv {
 
 static int
 nvkm_udevice_fault_new(struct nvif_device_priv *udev,
-                      const struct nvif_faultbuf_impl **pimpl, struct 
nvif_faultbuf_priv **ppriv,
-                      u64 handle)
+                      const struct nvif_faultbuf_impl **pimpl, struct 
nvif_faultbuf_priv **ppriv)
 {
        struct nvkm_object *object;
        int ret;
@@ -54,7 +53,8 @@ nvkm_udevice_fault_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