summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:07 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:10 +1000
commitf0961867b817e3aca45dca7e1885a7ec99a260ed (patch)
treeb93d4d063dc1a428fd88b89731883a94e6def2f8
parentb26ada6fedeb7cf6dacb1275a8ea08f4e39b53d2 (diff)
drm/nouveau/xtensa: cosmetic changes
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h2
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
index 7a216cca2865..bfe49b6f42a4 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
@@ -4,7 +4,7 @@
struct nvkm_gpuobj;
struct nvkm_xtensa {
- struct nvkm_engine base;
+ struct nvkm_engine engine;
u32 addr;
struct nvkm_gpuobj *gpu_fw;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
index 3995d2cf0668..7cc33836aadd 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c
@@ -100,7 +100,7 @@ _nvkm_xtensa_init(struct nvkm_object *object)
int i, ret;
u32 tmp;
- ret = nvkm_engine_init(&xtensa->base);
+ ret = nvkm_engine_init(&xtensa->engine);
if (ret)
return ret;
@@ -167,5 +167,5 @@ _nvkm_xtensa_fini(struct nvkm_object *object, bool suspend)
if (!suspend)
nvkm_gpuobj_ref(NULL, &xtensa->gpu_fw);
- return nvkm_engine_fini(&xtensa->base, suspend);
+ return nvkm_engine_fini(&xtensa->engine, suspend);
}