From 11271f9f8ff3755bf9a413d157dc7cb7c36856b1 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:08 +1000 Subject: [PATCH] drm/nouveau/mspdec: cosmetic changes This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs --- .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 8 +++---- drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c | 24 +++++++++----------- drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c | 26 +++++++++------------- drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c | 26 +++++++++------------- 4 files changed, 36 insertions(+), 48 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h index 2a27646..7532cd7 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h @@ -59,12 +59,12 @@ struct nvkm_falcon { #define nvkm_falcon_destroy(p) \ nvkm_engine_destroy(&(p)->engine) #define nvkm_falcon_init(p) ({ \ - struct nvkm_falcon *falcon = (p); \ - _nvkm_falcon_init(nv_object(falcon)); \ + struct nvkm_falcon *_falcon = (p); \ + _nvkm_falcon_init(nv_object(_falcon)); \ }) #define nvkm_falcon_fini(p,s) ({ \ - struct nvkm_falcon *falcon = (p); \ - _nvkm_falcon_fini(nv_object(falcon), (s)); \ + struct nvkm_falcon *_falcon = (p); \ + _nvkm_falcon_fini(nv_object(_falcon), (s)); \ }) int nvkm_falcon_create_(struct nvkm_object *, struct nvkm_object *, diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c index 2174577..55ffb3f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c @@ -24,10 +24,6 @@ #include #include -struct g98_mspdec_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSPDEC object classes ******************************************************************************/ @@ -63,15 +59,15 @@ g98_mspdec_cclass = { static int g98_mspdec_init(struct nvkm_object *object) { - struct g98_mspdec_priv *priv = (void *)object; + struct nvkm_falcon *mspdec = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(mspdec); if (ret) return ret; - nv_wr32(priv, 0x085010, 0x0000ffd2); - nv_wr32(priv, 0x08501c, 0x0000fff2); + nv_wr32(mspdec, 0x085010, 0x0000ffd2); + nv_wr32(mspdec, 0x08501c, 0x0000fff2); return 0; } @@ -80,18 +76,18 @@ g98_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct g98_mspdec_priv *priv; + struct nvkm_falcon *mspdec; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, - "PMSPDEC", "mspdec", &priv); - *pobject = nv_object(priv); + "PMSPDEC", "mspdec", &mspdec); + *pobject = nv_object(mspdec); if (ret) return ret; - nv_subdev(priv)->unit = 0x01020000; - nv_engine(priv)->cclass = &g98_mspdec_cclass; - nv_engine(priv)->sclass = g98_mspdec_sclass; + nv_subdev(mspdec)->unit = 0x01020000; + nv_engine(mspdec)->cclass = &g98_mspdec_cclass; + nv_engine(mspdec)->sclass = g98_mspdec_sclass; return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c index c814a5f..7c5d01d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c @@ -24,10 +24,6 @@ #include #include -struct gf100_mspdec_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSPDEC object classes ******************************************************************************/ @@ -62,15 +58,15 @@ gf100_mspdec_cclass = { static int gf100_mspdec_init(struct nvkm_object *object) { - struct gf100_mspdec_priv *priv = (void *)object; + struct nvkm_falcon *mspdec = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(mspdec); if (ret) return ret; - nv_wr32(priv, 0x085010, 0x0000fff2); - nv_wr32(priv, 0x08501c, 0x0000fff2); + nv_wr32(mspdec, 0x085010, 0x0000fff2); + nv_wr32(mspdec, 0x08501c, 0x0000fff2); return 0; } @@ -79,19 +75,19 @@ gf100_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gf100_mspdec_priv *priv; + struct nvkm_falcon *mspdec; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, - "PMSPDEC", "mspdec", &priv); - *pobject = nv_object(priv); + "PMSPDEC", "mspdec", &mspdec); + *pobject = nv_object(mspdec); if (ret) return ret; - nv_subdev(priv)->unit = 0x00020000; - nv_subdev(priv)->intr = nvkm_falcon_intr; - nv_engine(priv)->cclass = &gf100_mspdec_cclass; - nv_engine(priv)->sclass = gf100_mspdec_sclass; + nv_subdev(mspdec)->unit = 0x00020000; + nv_subdev(mspdec)->intr = nvkm_falcon_intr; + nv_engine(mspdec)->cclass = &gf100_mspdec_cclass; + nv_engine(mspdec)->sclass = gf100_mspdec_sclass; return 0; } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c index 9799206..6075518 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c @@ -24,10 +24,6 @@ #include #include -struct gk104_mspdec_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSPDEC object classes ******************************************************************************/ @@ -62,15 +58,15 @@ gk104_mspdec_cclass = { static int gk104_mspdec_init(struct nvkm_object *object) { - struct gk104_mspdec_priv *priv = (void *)object; + struct nvkm_falcon *falcon = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(falcon); if (ret) return ret; - nv_wr32(priv, 0x085010, 0x0000fff2); - nv_wr32(priv, 0x08501c, 0x0000fff2); + nv_wr32(falcon, 0x085010, 0x0000fff2); + nv_wr32(falcon, 0x08501c, 0x0000fff2); return 0; } @@ -79,19 +75,19 @@ gk104_mspdec_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gk104_mspdec_priv *priv; + struct nvkm_falcon *falcon; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x085000, true, - "PMSPDEC", "mspdec", &priv); - *pobject = nv_object(priv); + "PMSPDEC", "mspdec", &falcon); + *pobject = nv_object(falcon); if (ret) return ret; - nv_subdev(priv)->unit = 0x00020000; - nv_subdev(priv)->intr = nvkm_falcon_intr; - nv_engine(priv)->cclass = &gk104_mspdec_cclass; - nv_engine(priv)->sclass = gk104_mspdec_sclass; + nv_subdev(falcon)->unit = 0x00020000; + nv_subdev(falcon)->intr = nvkm_falcon_intr; + nv_engine(falcon)->cclass = &gk104_mspdec_cclass; + nv_engine(falcon)->sclass = gk104_mspdec_sclass; return 0; } -- 2.7.4