diff options
Diffstat (limited to 'nvkm/core')
| -rw-r--r-- | nvkm/core/client.c | 2 | ||||
| -rw-r--r-- | nvkm/core/engctx.c | 10 | ||||
| -rw-r--r-- | nvkm/core/gpuobj.c | 4 | ||||
| -rw-r--r-- | nvkm/core/parent.c | 2 | ||||
| -rw-r--r-- | nvkm/core/subdev.c | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/nvkm/core/client.c b/nvkm/core/client.c index e96243329..acff10387 100644 --- a/nvkm/core/client.c +++ b/nvkm/core/client.c @@ -190,7 +190,7 @@ nouveau_client_dtor(struct nouveau_object *object) nvkm_client_notify_del(client, i); nouveau_object_ref(NULL, &client->device); nouveau_handle_destroy(client->root); - nouveau_namedb_destroy(&client->base); + nouveau_namedb_destroy(&client->namedb); } static struct nouveau_oclass diff --git a/nvkm/core/engctx.c b/nvkm/core/engctx.c index 84c71fad2..6b9c72805 100644 --- a/nvkm/core/engctx.c +++ b/nvkm/core/engctx.c @@ -125,10 +125,10 @@ nouveau_engctx_destroy(struct nouveau_engctx *engctx) if (client->vm) atomic_dec(&client->vm->engref[nv_engidx(engobj)]); - if (engctx->base.size) - nouveau_gpuobj_destroy(&engctx->base); + if (engctx->gpuobj.size) + nouveau_gpuobj_destroy(&engctx->gpuobj); else - nouveau_object_destroy(&engctx->base.base); + nouveau_object_destroy(&engctx->gpuobj.object); } int @@ -140,7 +140,7 @@ nouveau_engctx_init(struct nouveau_engctx *engctx) struct nouveau_subdev *pardev; int ret; - ret = nouveau_gpuobj_init(&engctx->base); + ret = nouveau_gpuobj_init(&engctx->gpuobj); if (ret) return ret; @@ -186,7 +186,7 @@ nouveau_engctx_fini(struct nouveau_engctx *engctx, bool suspend) } nv_debug(parent, "detached %s context\n", subdev->name); - return nouveau_gpuobj_fini(&engctx->base, suspend); + return nouveau_gpuobj_fini(&engctx->gpuobj, suspend); } int diff --git a/nvkm/core/gpuobj.c b/nvkm/core/gpuobj.c index daee87702..0a9ea1fa9 100644 --- a/nvkm/core/gpuobj.c +++ b/nvkm/core/gpuobj.c @@ -47,7 +47,7 @@ nouveau_gpuobj_destroy(struct nouveau_gpuobj *gpuobj) if (gpuobj->heap.block_size) nouveau_mm_fini(&gpuobj->heap); - nouveau_object_destroy(&gpuobj->base); + nouveau_object_destroy(&gpuobj->object); } int @@ -290,7 +290,7 @@ nouveau_gpudup_dtor(struct nouveau_object *object) { struct nouveau_gpuobj *gpuobj = (void *)object; nouveau_object_ref(NULL, &gpuobj->parent); - nouveau_object_destroy(&gpuobj->base); + nouveau_object_destroy(&gpuobj->object); } static struct nouveau_oclass diff --git a/nvkm/core/parent.c b/nvkm/core/parent.c index 30a291187..07a2006a1 100644 --- a/nvkm/core/parent.c +++ b/nvkm/core/parent.c @@ -150,7 +150,7 @@ nouveau_parent_destroy(struct nouveau_parent *parent) kfree(sclass); } - nouveau_object_destroy(&parent->base); + nouveau_object_destroy(&parent->object); } diff --git a/nvkm/core/subdev.c b/nvkm/core/subdev.c index 2ea5568b6..28157bf57 100644 --- a/nvkm/core/subdev.c +++ b/nvkm/core/subdev.c @@ -38,11 +38,11 @@ nouveau_subdev_reset(struct nouveau_object *subdev) int nouveau_subdev_init(struct nouveau_subdev *subdev) { - int ret = nouveau_object_init(&subdev->base); + int ret = nouveau_object_init(&subdev->object); if (ret) return ret; - nouveau_subdev_reset(&subdev->base); + nouveau_subdev_reset(&subdev->object); return 0; } @@ -60,7 +60,7 @@ nouveau_subdev_fini(struct nouveau_subdev *subdev, bool suspend) nv_mask(subdev, 0x000200, subdev->unit, subdev->unit); } - return nouveau_object_fini(&subdev->base, suspend); + return nouveau_object_fini(&subdev->object, suspend); } int @@ -74,7 +74,7 @@ nouveau_subdev_destroy(struct nouveau_subdev *subdev) { int subidx = nv_hclass(subdev) & 0xff; nv_device(subdev)->subdev[subidx] = NULL; - nouveau_object_destroy(&subdev->base); + nouveau_object_destroy(&subdev->object); } void |