drm/nouveau/bios: 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/bios.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
index cef287e..0b102c8 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
@@ -3,7 +3,7 @@
 #include <core/subdev.h>
 
 struct nvkm_bios {
-       struct nvkm_subdev base;
+       struct nvkm_subdev subdev;
        u32 size;
        u8 *data;
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
index 8db204f..0cd9ab4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
@@ -171,21 +171,21 @@ nvkm_bios_dtor(struct nvkm_object *object)
 {
        struct nvkm_bios *bios = (void *)object;
        kfree(bios->data);
-       nvkm_subdev_destroy(&bios->base);
+       nvkm_subdev_destroy(&bios->subdev);
 }
 
 static int
 nvkm_bios_init(struct nvkm_object *object)
 {
        struct nvkm_bios *bios = (void *)object;
-       return nvkm_subdev_init(&bios->base);
+       return nvkm_subdev_init(&bios->subdev);
 }
 
 static int
 nvkm_bios_fini(struct nvkm_object *object, bool suspend)
 {
        struct nvkm_bios *bios = (void *)object;
-       return nvkm_subdev_fini(&bios->base, suspend);
+       return nvkm_subdev_fini(&bios->subdev, suspend);
 }
 
 struct nvkm_oclass

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
index 6192a9e..c64a548 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
@@ -206,7 +206,7 @@ nvbios_shadow(struct nvkm_bios *bios)
                { shadow_class, 1, &nvbios_pcirom },
                { shadow_class, 1, &nvbios_platform },
                { shadow_class }
-       }, *mthd = mthds, *best = NULL;
+       }, *mthd, *best = NULL;
        const char *optarg;
        char *source;
        int optlen;