diff options
author | 2015-08-20 14:54:08 +1000 | |
---|---|---|
committer | 2015-08-28 12:40:12 +1000 | |
commit | 74137ffcd1dfd6537bbfdd1d1149942412280e9e (patch) | |
tree | edf30b14849a66f9e8657bf2dbf6970773424a9d /drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | |
parent | drm/nouveau/msppp: cosmetic changes (diff) | |
download | linux-dev-74137ffcd1dfd6537bbfdd1d1149942412280e9e.tar.xz linux-dev-74137ffcd1dfd6537bbfdd1d1149942412280e9e.zip |
drm/nouveau/msvld: cosmetic changes
This is purely preparation for upcoming commits, there should be no
code changes here.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c index c8a6b4ef52a1..055bc2141f6b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c @@ -24,10 +24,6 @@ #include <engine/msvld.h> #include <engine/falcon.h> -struct g98_msvld_priv { - struct nvkm_falcon base; -}; - /******************************************************************************* * MSVLD object classes ******************************************************************************/ @@ -64,15 +60,15 @@ g98_msvld_cclass = { static int g98_msvld_init(struct nvkm_object *object) { - struct g98_msvld_priv *priv = (void *)object; + struct nvkm_falcon *msvld = (void *)object; int ret; - ret = nvkm_falcon_init(&priv->base); + ret = nvkm_falcon_init(msvld); if (ret) return ret; - nv_wr32(priv, 0x084010, 0x0000ffd2); - nv_wr32(priv, 0x08401c, 0x0000fff2); + nv_wr32(msvld, 0x084010, 0x0000ffd2); + nv_wr32(msvld, 0x08401c, 0x0000fff2); return 0; } @@ -81,18 +77,18 @@ g98_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct g98_msvld_priv *priv; + struct nvkm_falcon *msvld; int ret; ret = nvkm_falcon_create(parent, engine, oclass, 0x084000, true, - "PMSVLD", "msvld", &priv); - *pobject = nv_object(priv); + "PMSVLD", "msvld", &msvld); + *pobject = nv_object(msvld); if (ret) return ret; - nv_subdev(priv)->unit = 0x04008000; - nv_engine(priv)->cclass = &g98_msvld_cclass; - nv_engine(priv)->sclass = g98_msvld_sclass; + nv_subdev(msvld)->unit = 0x04008000; + nv_engine(msvld)->cclass = &g98_msvld_cclass; + nv_engine(msvld)->sclass = g98_msvld_sclass; return 0; } |