---

yaml --- r: 329673 b: refs/heads/master c: aa74c37 h: refs/heads/master i: 329671: b526b32 v: v3
git-mirror · Oct 3, 2012 · 48b2b70 · 48b2b70
1 parent 0197b98
commit 48b2b70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git 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
@@ -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