diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2014-12-03 12:56:41 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-10 23:57:06 +1000 |
commit | 223b3b8d88982f7c7b102e66fd2fe7f3b4228eec (patch) | |
tree | b06bd30ca2e93fede258374c34228f81d9aa8e40 /nvkm/include/engine/fifo.h | |
parent | 8b18b785ebe9262162422930f9ddea9b5dd9d4b3 (diff) | |
download | nouveau-223b3b8d88982f7c7b102e66fd2fe7f3b4228eec.tar.gz |
core: rename subclass.base to subclass.superclass
Makes things a bit more readable. This is specially important now as
upcoming commits are going to be gradually removing the use of macros
for down-casts, in favour of compile-time checking.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/include/engine/fifo.h')
-rw-r--r-- | nvkm/include/engine/fifo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nvkm/include/engine/fifo.h b/nvkm/include/engine/fifo.h index c52b939f5..27f05de8f 100644 --- a/nvkm/include/engine/fifo.h +++ b/nvkm/include/engine/fifo.h @@ -7,7 +7,7 @@ #include <core/event.h> struct nouveau_fifo_chan { - struct nouveau_namedb base; + struct nouveau_namedb namedb; struct nouveau_dmaobj *pushdma; struct nouveau_gpuobj *pushgpu; void __iomem *user; @@ -27,9 +27,9 @@ nouveau_fifo_chan(void *obj) nouveau_fifo_channel_create_((p), (e), (c), (b), (a), (s), (n), \ (m), sizeof(**d), (void **)d) #define nouveau_fifo_channel_init(p) \ - nouveau_namedb_init(&(p)->base) + nouveau_namedb_init(&(p)->namedb) #define nouveau_fifo_channel_fini(p,s) \ - nouveau_namedb_fini(&(p)->base, (s)) + nouveau_namedb_fini(&(p)->namedb, (s)) int nouveau_fifo_channel_create_(struct nouveau_object *, struct nouveau_object *, @@ -48,17 +48,17 @@ void _nouveau_fifo_channel_wr32(struct nouveau_object *, u64, u32); int _nouveau_fifo_channel_ntfy(struct nouveau_object *, u32, struct nvkm_event **); struct nouveau_fifo_base { - struct nouveau_gpuobj base; + struct nouveau_gpuobj gpuobj; }; #define nouveau_fifo_context_create(p,e,c,g,s,a,f,d) \ nouveau_gpuobj_create((p), (e), (c), 0, (g), (s), (a), (f), (d)) #define nouveau_fifo_context_destroy(p) \ - nouveau_gpuobj_destroy(&(p)->base) + nouveau_gpuobj_destroy(&(p)->gpuobj) #define nouveau_fifo_context_init(p) \ - nouveau_gpuobj_init(&(p)->base) + nouveau_gpuobj_init(&(p)->gpuobj) #define nouveau_fifo_context_fini(p,s) \ - nouveau_gpuobj_fini(&(p)->base, (s)) + nouveau_gpuobj_fini(&(p)->gpuobj, (s)) #define _nouveau_fifo_context_dtor _nouveau_gpuobj_dtor #define _nouveau_fifo_context_init _nouveau_gpuobj_init |