drm/nouveau/mxm: 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/mxm.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
index fba613477b1a54ead490a7c4f471056928e4e74f..98904392547d66ca1b161ee8b2a5508367a0e855 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
@@ -5,7 +5,7 @@
 #define MXM_SANITISE_DCB 0x00000001
 
 struct nvkm_mxm {
-       struct nvkm_subdev base;
+       struct nvkm_subdev subdev;
        u32 action;
        u8 *mxms;
 };
@@ -19,9 +19,9 @@ nvkm_mxm(void *obj)
 #define nvkm_mxm_create(p,e,o,d)                                            \
        nvkm_mxm_create_((p), (e), (o), sizeof(**d), (void **)d)
 #define nvkm_mxm_init(p)                                                    \
-       nvkm_subdev_init(&(p)->base)
+       nvkm_subdev_init(&(p)->subdev)
 #define nvkm_mxm_fini(p,s)                                                  \
-       nvkm_subdev_fini(&(p)->base, (s))
+       nvkm_subdev_fini(&(p)->subdev, (s))
 int  nvkm_mxm_create_(struct nvkm_object *, struct nvkm_object *,
                         struct nvkm_oclass *, int, void **);
 void nvkm_mxm_destroy(struct nvkm_mxm *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
index f20e4ca87e17de9c8e4e145990d331288a6f6df1..0add310c3fbbcc1e5ca0befe71b4e60ae33af631 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
@@ -28,10 +28,6 @@
 #include <subdev/bios/dcb.h>
 #include <subdev/bios/mxm.h>
 
-struct nv50_mxm_priv {
-       struct nvkm_mxm base;
-};
-
 struct context {
        u32 *outp;
        struct mxms_odev desc;
@@ -206,16 +202,16 @@ nv50_mxm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
              struct nvkm_oclass *oclass, void *data, u32 size,
              struct nvkm_object **pobject)
 {
-       struct nv50_mxm_priv *priv;
+       struct nvkm_mxm *mxm;
        int ret;
 
-       ret = nvkm_mxm_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
+       ret = nvkm_mxm_create(parent, engine, oclass, &mxm);
+       *pobject = nv_object(mxm);
        if (ret)
                return ret;
 
-       if (priv->base.action & MXM_SANITISE_DCB)
-               mxm_dcb_sanitise(&priv->base);
+       if (mxm->action & MXM_SANITISE_DCB)
+               mxm_dcb_sanitise(mxm);
        return 0;
 }