From f0961867b817e3aca45dca7e1885a7ec99a260ed Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:07 +1000 Subject: [PATCH] drm/nouveau/xtensa: cosmetic changes This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 4 ++-- 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 7a216cc..bfe49b6 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 3995d2c..7cc3383 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); } -- 2.7.4