From 48b2b70f44d384ab58b780eee3943d4ecffbc690 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 12 Sep 2012 13:38:13 +1000
Subject: [PATCH] --- yaml --- r: 329673 b: refs/heads/master c:
 aa74c3755ecc24914f9b3aaf5ba1436836697a7d h: refs/heads/master i:   329671:
 b526b32675f956e0a9fdce963874446100221c44 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_drm.h | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 338d57bcc6dd..c94ac913e94c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa6df8c163ddf1fba658059695ab9587f344712c
+refs/heads/master: aa74c3755ecc24914f9b3aaf5ba1436836697a7d
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drm.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drm.h
index ab0c17430c66..3c12e9862e37 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -132,20 +132,13 @@ nouveau_dev(struct drm_device *dev)
 int nouveau_drm_suspend(struct pci_dev *, pm_message_t);
 int nouveau_drm_resume(struct pci_dev *);
 
-#define NV_PRINTK(level, code, drm, fmt, args...)                              \
-	printk(level "nouveau " code "[     DRM][%s] " fmt,                    \
-	       pci_name((drm)->dev->pdev), ##args)
-#define NV_FATAL(drm, fmt, args...)                                            \
-	NV_PRINTK(KERN_CRIT, "!", (drm), fmt, ##args)
-#define NV_ERROR(drm, fmt, args...)                                            \
-	NV_PRINTK(KERN_ERR, "E", (drm), fmt, ##args)
-#define NV_WARN(drm, fmt, args...)                                             \
-	NV_PRINTK(KERN_WARNING, "W", (drm), fmt, ##args)
-#define NV_INFO(drm, fmt, args...)                                             \
-	NV_PRINTK(KERN_INFO, " ", (drm), fmt, ##args)
-#define NV_DEBUG(drm, fmt, args...) do {                                       \
+#define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args)
+#define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args)
+#define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args)
+#define NV_INFO(cli, fmt, args...) nv_info((cli), fmt, ##args)
+#define NV_DEBUG(cli, fmt, args...) do {                                       \
 	if (drm_debug & DRM_UT_DRIVER)                                         \
-		NV_PRINTK(KERN_DEBUG, "D", drm, fmt, ##args);                  \
+		nv_info((cli), fmt, ##args);                                   \
 } while (0)
 
 #endif