drm/nouveau/mmu: cosmetic changes

This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
index 3a53687..b596a1d 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
@@ -38,7 +38,7 @@ struct nvkm_vm {
 };
 
 struct nvkm_mmu {
-       struct nvkm_subdev base;
+       struct nvkm_subdev subdev;
 
        u64 limit;
        u8  dma_bits;
@@ -69,11 +69,11 @@ nvkm_mmu(void *obj)
 #define nvkm_mmu_create(p,e,o,i,f,d)                                      \
        nvkm_subdev_create((p), (e), (o), 0, (i), (f), (d))
 #define nvkm_mmu_destroy(p)                                               \
-       nvkm_subdev_destroy(&(p)->base)
+       nvkm_subdev_destroy(&(p)->subdev)
 #define nvkm_mmu_init(p)                                                  \
-       nvkm_subdev_init(&(p)->base)
+       nvkm_subdev_init(&(p)->subdev)
 #define nvkm_mmu_fini(p,s)                                                \
-       nvkm_subdev_fini(&(p)->base, (s))
+       nvkm_subdev_fini(&(p)->subdev, (s))
 
 #define _nvkm_mmu_dtor _nvkm_subdev_dtor
 #define _nvkm_mmu_init _nvkm_subdev_init

diff --cc drivers/gpu/drm/nouveau/nouveau_ttm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv50.c
Simple merge