From a00014e3963642e7cf7206a9fa814b547d642a72 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 20 Aug 2015 14:54:06 +1000
Subject: [PATCH] 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>
---
 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h | 2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c    | 6 +++---
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
index cef287e0bbf2..0b102c8f69c8 100644
--- 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 8db204f92ed3..0cd9ab4ed8ee 100644
--- 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 6192a9e27bb7..c64a5484c9c8 100644
--- 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;