1 files changed, 23 insertions, 25 deletions

diff --git a/drm/nouveau/include/nvkm/core/client.h b/drm/nouveau/include/nvkm/core/client.h
index 827c4e972..a35b38244 100644
--- a/drm/nouveau/include/nvkm/core/client.h
+++ b/drm/nouveau/include/nvkm/core/client.h
@@ -1,15 +1,14 @@
-#ifndef __NOUVEAU_CLIENT_H__
-#define __NOUVEAU_CLIENT_H__
-
+#ifndef __NVKM_CLIENT_H__
+#define __NVKM_CLIENT_H__
 #include <core/namedb.h>
 
-struct nouveau_client {
-	struct nouveau_namedb namedb;
-	struct nouveau_handle *root;
-	struct nouveau_object *device;
+struct nvkm_client {
+	struct nvkm_namedb namedb;
+	struct nvkm_handle *root;
+	struct nvkm_object *device;
 	char name[32];
 	u32 debug;
-	struct nouveau_vm *vm;
+	struct nvkm_vm *vm;
 	bool super;
 	void *data;
 
@@ -17,7 +16,7 @@ struct nouveau_client {
 	struct nvkm_client_notify *notify[16];
 };
 
-static inline struct nouveau_client *
+static inline struct nvkm_client *
 nv_client(void *obj)
 {
 #if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
@@ -27,31 +26,30 @@ nv_client(void *obj)
 	return obj;
 }
 
-static inline struct nouveau_client *
-nouveau_client(void *obj)
+static inline struct nvkm_client *
+nvkm_client(void *obj)
 {
-	struct nouveau_object *client = nv_object(obj);
+	struct nvkm_object *client = nv_object(obj);
 	while (client && !(nv_iclass(client, NV_CLIENT_CLASS)))
 		client = client->parent;
 	return (void *)client;
 }
 
-#define nouveau_client_create(n,c,oc,od,d)                                     \
-	nouveau_client_create_((n), (c), (oc), (od), sizeof(**d), (void **)d)
+#define nvkm_client_create(n,c,oc,od,d)                                     \
+	nvkm_client_create_((n), (c), (oc), (od), sizeof(**d), (void **)d)
 
-int  nouveau_client_create_(const char *name, u64 device, const char *cfg,
+int  nvkm_client_create_(const char *name, u64 device, const char *cfg,
 			    const char *dbg, int, void **);
-#define nouveau_client_destroy(p)                                              \
-	nouveau_namedb_destroy(&(p)->base)
+#define nvkm_client_destroy(p)                                              \
+	nvkm_namedb_destroy(&(p)->base)
 
-int  nouveau_client_init(struct nouveau_client *);
-int  nouveau_client_fini(struct nouveau_client *, bool suspend);
-const char *nouveau_client_name(void *obj);
+int  nvkm_client_init(struct nvkm_client *);
+int  nvkm_client_fini(struct nvkm_client *, bool suspend);
+const char *nvkm_client_name(void *obj);
 
-int nvkm_client_notify_new(struct nouveau_object *, struct nvkm_event *,
+int nvkm_client_notify_new(struct nvkm_object *, struct nvkm_event *,
 			   void *data, u32 size);
-int nvkm_client_notify_del(struct nouveau_client *, int index);
-int nvkm_client_notify_get(struct nouveau_client *, int index);
-int nvkm_client_notify_put(struct nouveau_client *, int index);
-
+int nvkm_client_notify_del(struct nvkm_client *, int index);
+int nvkm_client_notify_get(struct nvkm_client *, int index);
+int nvkm_client_notify_put(struct nvkm_client *, int index);
 #endif