drm/nouveau: finalise nvkm namespace switch (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, 7 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_nvif.c b/drivers/gpu/drm/nouveau/nouveau_nvif.c
index 7f7bd329425e..ca0ad9d1563d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_nvif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_nvif.c
@@ -60,22 +60,22 @@ nvkm_client_ioctl(void *priv, bool super, void *data, u32 size, void **hack)
 static int
 nvkm_client_resume(void *priv)
 {
-        return nouveau_client_init(priv);
+        return nvkm_client_init(priv);
 }
 
 static int
 nvkm_client_suspend(void *priv)
 {
-        return nouveau_client_fini(priv, true);
+        return nvkm_client_fini(priv, true);
 }
 
 static void
 nvkm_client_driver_fini(void *priv)
 {
-        struct nouveau_object *client = priv;
-        nouveau_client_fini(nv_client(client), false);
+        struct nvkm_object *client = priv;
+        nvkm_client_fini(nv_client(client), false);
         atomic_set(&client->refcount, 1);
-        nouveau_object_ref(NULL, &client);
+        nvkm_object_ref(NULL, &client);
 }
 
 static int
@@ -110,10 +110,10 @@ static int
 nvkm_client_driver_init(const char *name, u64 device, const char *cfg,
                         const char *dbg, void **ppriv)
 {
-        struct nouveau_client *client;
+        struct nvkm_client *client;
         int ret;
 
-        ret = nouveau_client_create(name, device, cfg, dbg, &client);
+        ret = nvkm_client_create(name, device, cfg, dbg, &client);
         *ppriv = client;
         if (ret)
                 return ret;