- no more users Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx> --- drivers/gpu/drm/nouveau/include/nvif/driverif.h | 3 +-- drivers/gpu/drm/nouveau/nvif/client.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 8f56798d6509..39e965a184fd 100644 --- a/drivers/gpu/drm/nouveau/include/nvif/driverif.h +++ b/drivers/gpu/drm/nouveau/include/nvif/driverif.h @@ -22,8 +22,7 @@ struct nvif_client_impl { struct { int (*new)(struct nvif_client_priv *parent, - const struct nvif_client_impl **, struct nvif_client_priv **, - u64 handle); + const struct nvif_client_impl **, struct nvif_client_priv **); } client; struct { diff --git a/drivers/gpu/drm/nouveau/nvif/client.c b/drivers/gpu/drm/nouveau/nvif/client.c index 0211fa76431f..6b3c7b28b212 100644 --- a/drivers/gpu/drm/nouveau/nvif/client.c +++ b/drivers/gpu/drm/nouveau/nvif/client.c @@ -54,8 +54,7 @@ nvif_client_ctor(struct nvif_client *parent, const char *name, struct nvif_clien { int ret; - ret = parent->impl->client.new(parent->priv, &client->impl, &client->priv, - nvif_handle(&client->object)); + ret = parent->impl->client.new(parent->priv, &client->impl, &client->priv); NVIF_ERRON(ret, &parent->object, "[NEW client]"); 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 1763e863115c..a77014b342c0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/client.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c @@ -48,8 +48,7 @@ nvkm_client_new_device(struct nvif_client_priv *client, static int nvkm_client_new_client(struct nvif_client_priv *parent, - const struct nvif_client_impl **pimpl, struct nvif_client_priv **ppriv, - u64 handle) + const struct nvif_client_impl **pimpl, struct nvif_client_priv **ppriv) { struct nvkm_client *client; int ret; @@ -61,7 +60,8 @@ nvkm_client_new_client(struct nvif_client_priv *parent, *pimpl = &nvkm_client_impl; *ppriv = client; - return nvkm_object_link_rb(parent, &parent->object, handle, &client->object); + nvkm_object_link_(parent, &parent->object, &client->object); + return 0; } static void -- 2.41.0