[PATCH 086/156] drm/nouveau/nvif: remove mmu from object rb

[Ben Skeggs]

- no more users

Signed-off-by: Ben Skeggs <bske...@nvidia.com>
---
 drivers/gpu/drm/nouveau/include/nvif/driverif.h | 2 +-
 drivers/gpu/drm/nouveau/nvif/mmu.c              | 3 +--
 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 4d256a3c3fcf..8f1410ab8256 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h
@@ -201,7 +201,7 @@ struct nvif_device_impl {
        struct {
                s32 oclass;
                int (*new)(struct nvif_device_priv *, const struct 
nvif_mmu_impl **,
-                          struct nvif_mmu_priv **, u64 handle);
+                          struct nvif_mmu_priv **);
        } mmu;
 
        struct {
diff --git a/drivers/gpu/drm/nouveau/nvif/mmu.c 
b/drivers/gpu/drm/nouveau/nvif/mmu.c
index cf1d27f2678d..b5adf35d9535 100644
--- a/drivers/gpu/drm/nouveau/nvif/mmu.c
+++ b/drivers/gpu/drm/nouveau/nvif/mmu.c
@@ -43,8 +43,7 @@ nvif_mmu_ctor(struct nvif_device *device, const char *name, 
struct nvif_mmu *mmu
 
        mmu->impl = NULL;
 
-       ret = device->impl->mmu.new(device->priv, &mmu->impl, &mmu->priv,
-                                   nvif_handle(&mmu->object));
+       ret = device->impl->mmu.new(device->priv, &mmu->impl, &mmu->priv);
        NVIF_ERRON(ret, &device->object, "[NEW mmu%08x]", 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 e9486d9da64b..e63462188f2a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/device/user.c
@@ -79,8 +79,7 @@ nvkm_udevice_time(struct nvif_device_priv *udev)
 
 static int
 nvkm_udevice_mmu_new(struct nvif_device_priv *udev,
-                    const struct nvif_mmu_impl **pimpl, struct nvif_mmu_priv 
**ppriv,
-                    u64 handle)
+                    const struct nvif_mmu_impl **pimpl, struct nvif_mmu_priv 
**ppriv)
 {
        struct nvkm_device *device = udev->device;
        struct nvkm_object *object;
@@ -90,7 +89,8 @@ nvkm_udevice_mmu_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 void
-- 
2.41.0