diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-12-22 15:23:04 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-02-17 15:14:56 +1000 |
| commit | daad3dfb05be8b0682c1bb0db6b59e50a4bb95f6 (patch) | |
| tree | 63a387825f3db949300204177b9c22ba2d6754a4 /drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | |
| parent | 110cccff955313c66dccd2817f62368f106d9bf2 (diff) | |
| download | linux-daad3dfb05be8b0682c1bb0db6b59e50a4bb95f6.tar.bz2 | |
drm/nouveau/core/client: lookup client objects with nvkm_object_search()
Custom code is no longer needed here.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/core/ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c index b0db51847c36..6e695b7a5733 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c @@ -128,7 +128,7 @@ nvkm_ioctl_new(struct nvkm_object *parent, void *data, u32 size) object->route = args->v0.route; object->token = args->v0.token; object->object = args->v0.object; - if (nvkm_client_insert(client, object)) { + if (nvkm_object_insert(object)) { client->data = object; return 0; } @@ -389,13 +389,10 @@ nvkm_ioctl_path(struct nvkm_client *client, u64 handle, u32 type, struct nvkm_object *object; int ret; - if (handle) - object = nvkm_client_search(client, handle); - else - object = &client->object; - if (unlikely(!object)) { + object = nvkm_object_search(client, handle, NULL); + if (IS_ERR(object)) { nvif_ioctl(&client->object, "object not found\n"); - return -ENOENT; + return PTR_ERR(object); } if (owner != NVIF_IOCTL_V0_OWNER_ANY && owner != object->route) { |