From 76e9799b8a465bc3545823ed283a6c3a049c7524 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 23 Mar 2015 21:52:00 +0000
Subject: nouveau: annotate the private symbols

They are less and easier to track than the public ones. The macro
drm_public will be going away by the end of the series.

Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 nouveau/abi16.c   | 14 +++++++-------
 nouveau/nouveau.c |  2 +-
 nouveau/private.h | 18 +++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nouveau/abi16.c b/nouveau/abi16.c
index ae13821b..538f3a73 100644
--- a/nouveau/abi16.c
+++ b/nouveau/abi16.c
@@ -33,7 +33,7 @@
 #include "private.h"
 
 
-int
+drm_private int
 abi16_chan_nv04(struct nouveau_object *obj)
 {
 	struct nouveau_device *dev = (struct nouveau_device *)obj->parent;
@@ -54,7 +54,7 @@ abi16_chan_nv04(struct nouveau_object *obj)
 	return 0;
 }
 
-int
+drm_private int
 abi16_chan_nvc0(struct nouveau_object *obj)
 {
 	struct nouveau_device *dev = (struct nouveau_device *)obj->parent;
@@ -75,7 +75,7 @@ abi16_chan_nvc0(struct nouveau_object *obj)
 	return 0;
 }
 
-int
+drm_private int
 abi16_chan_nve0(struct nouveau_object *obj)
 {
 	struct nouveau_device *dev = (struct nouveau_device *)obj->parent;
@@ -101,7 +101,7 @@ abi16_chan_nve0(struct nouveau_object *obj)
 	return 0;
 }
 
-int
+drm_private int
 abi16_engobj(struct nouveau_object *obj)
 {
 	struct drm_nouveau_grobj_alloc req = {
@@ -120,7 +120,7 @@ abi16_engobj(struct nouveau_object *obj)
 	return 0;
 }
 
-int
+drm_private int
 abi16_ntfy(struct nouveau_object *obj)
 {
 	struct nv04_notify *ntfy = obj->data;
@@ -141,7 +141,7 @@ abi16_ntfy(struct nouveau_object *obj)
 	return 0;
 }
 
-void
+drm_private void
 abi16_bo_info(struct nouveau_bo *bo, struct drm_nouveau_gem_info *info)
 {
 	struct nouveau_bo_priv *nvbo = nouveau_bo(bo);
@@ -175,7 +175,7 @@ abi16_bo_info(struct nouveau_bo *bo, struct drm_nouveau_gem_info *info)
 	}
 }
 
-int
+drm_private int
 abi16_bo_init(struct nouveau_bo *bo, uint32_t alignment,
 	      union nouveau_bo_config *config)
 {
diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index 2d95b74b..5c8a0ec5 100644
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -45,7 +45,7 @@
 #include "private.h"
 
 #ifdef DEBUG
-uint32_t nouveau_debug = 0;
+drm_private uint32_t nouveau_debug = 0;
 
 static void
 debug_init(char *args)
diff --git a/nouveau/private.h b/nouveau/private.h
index bf9db042..74d604e8 100644
--- a/nouveau/private.h
+++ b/nouveau/private.h
@@ -10,7 +10,7 @@
 #include "nouveau.h"
 
 #ifdef DEBUG
-uint32_t nouveau_debug;
+drm_private uint32_t nouveau_debug;
 #define dbg_on(lvl) (nouveau_debug & (1 << lvl))
 #define dbg(lvl, fmt, args...) do {                                            \
 	if (dbg_on((lvl)))                                                     \
@@ -114,13 +114,13 @@ int
 nouveau_device_open_existing(struct nouveau_device **, int, int, drm_context_t);
 
 /* abi16.c */
-int  abi16_chan_nv04(struct nouveau_object *);
-int  abi16_chan_nvc0(struct nouveau_object *);
-int  abi16_chan_nve0(struct nouveau_object *);
-int  abi16_engobj(struct nouveau_object *);
-int  abi16_ntfy(struct nouveau_object *);
-void abi16_bo_info(struct nouveau_bo *, struct drm_nouveau_gem_info *);
-int  abi16_bo_init(struct nouveau_bo *, uint32_t alignment,
-		   union nouveau_bo_config *);
+drm_private int  abi16_chan_nv04(struct nouveau_object *);
+drm_private int  abi16_chan_nvc0(struct nouveau_object *);
+drm_private int  abi16_chan_nve0(struct nouveau_object *);
+drm_private int  abi16_engobj(struct nouveau_object *);
+drm_private int  abi16_ntfy(struct nouveau_object *);
+drm_private void abi16_bo_info(struct nouveau_bo *, struct drm_nouveau_gem_info *);
+drm_private int  abi16_bo_init(struct nouveau_bo *, uint32_t alignment,
+			       union nouveau_bo_config *);
 
 #endif
-- 
cgit v1.2.3