drm/nouveau/bios: namespace + nvidia gpu names (no binary change)

The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
index 39528a9f3c20..cef287e0bbf2 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
@@ -1,11 +1,9 @@
-#ifndef __NOUVEAU_BIOS_H__
-#define __NOUVEAU_BIOS_H__
-
+#ifndef __NVKM_BIOS_H__
+#define __NVKM_BIOS_H__
 #include <core/subdev.h>
-#include <core/device.h>
 
-struct nouveau_bios {
-	struct nouveau_subdev base;
+struct nvkm_bios {
+	struct nvkm_subdev base;
 	u32 size;
 	u8 *data;
 
@@ -21,15 +19,14 @@ struct nouveau_bios {
 	} version;
 };
 
-static inline struct nouveau_bios *
-nouveau_bios(void *obj)
+static inline struct nvkm_bios *
+nvkm_bios(void *obj)
 {
-	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_VBIOS);
+	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_VBIOS);
 }
 
 u8  nvbios_checksum(const u8 *data, int size);
 u16 nvbios_findstr(const u8 *data, int size, const char *str, int len);
 
-extern struct nouveau_oclass nouveau_bios_oclass;
-
+extern struct nvkm_oclass nvkm_bios_oclass;
 #endif