From c2fab469b66f2796c541e911202faa411d116b04 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 8 Oct 2006 18:26:26 +0300
Subject: [PATCH] dix/devices: clean up debugging

---
 dix/devices.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 74474c9b9..54332e7f3 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -149,9 +149,6 @@ EnableDevice(register DeviceIntPtr dev)
     if ((*prev != dev) || !dev->inited ||
 	((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
         ErrorF("couldn't enable device %d\n", dev->id);
-#ifdef DEBUG
-        ErrorF("prev is %p, dev is %p, dev->inited is %d, ret is %d\n", prev, dev, dev->inited, ret);
-#endif
 	return FALSE;
     }
     *prev = dev->next;
@@ -365,25 +362,15 @@ InitAndStartDevices()
     register DeviceIntPtr dev, next;
 
     for (dev = inputInfo.off_devices; dev; dev = dev->next) {
-#ifdef DEBUG
-        ErrorF("(dix) initialising device %d\n", dev->id);
-#endif
+        DebugF("(dix) initialising device %d\n", dev->id);
 	ActivateDevice(dev);
-#ifdef DEBUG
-        ErrorF("(dix) finished device %d, inited is %d\n", dev->id, dev->inited);
-#endif
     }
     for (dev = inputInfo.off_devices; dev; dev = next)
     {
-#ifdef DEBUG
-        ErrorF("(dix) enabling device %d\n", dev->id);
-#endif
+        DebugF("(dix) enabling device %d\n", dev->id);
 	next = dev->next;
 	if (dev->inited && dev->startup)
 	    (void)EnableDevice(dev);
-#ifdef DEBUG
-        ErrorF("(dix) finished device %d\n", dev->id);
-#endif
     }
     for (dev = inputInfo.devices;
 	 dev && (dev != inputInfo.keyboard);
@@ -527,9 +514,7 @@ RemoveDevice(DeviceIntPtr dev)
     DeviceIntRec dummyDev;
 #endif
 
-#ifdef DEBUG
-    ErrorF("want to remove device %p, kb is %p, pointer is %p\n", dev, inputInfo.keyboard, inputInfo.pointer);
-#endif
+    DebugF("(dix) removing device %d\n", dev->id);
 
     if (!dev || dev == inputInfo.keyboard || dev == inputInfo.pointer)
         return BadImplementation;