From 23d970e6b91158350c1ef694f26d24851e7c34c5 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Tue, 6 Feb 2007 23:53:48 -0800
Subject: [PATCH] More DPRINTF cleanup.

--HG--
extra : convert_revision : db89cea42b46476d19333038522a6c144eafdab1
---
 src/mem/bus.cc    | 6 ++++--
 src/mem/packet.cc | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 2d7f20ae6..cc2137e66 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -180,7 +180,8 @@ Bus::recvTiming(PacketPtr pkt)
             }
         } else {
             //Snoop didn't succeed
-            DPRINTF(Bus, "Adding a retry to RETRY list %i\n", pktPort);
+            DPRINTF(Bus, "Adding a retry to RETRY list %d\n",
+                    pktPort->getId());
             addToRetryList(pktPort);
             return false;
         }
@@ -207,7 +208,8 @@ Bus::recvTiming(PacketPtr pkt)
         }
 
         // Packet not successfully sent. Leave or put it on the retry list.
-        DPRINTF(Bus, "Adding a retry to RETRY list %i\n", pktPort);
+        DPRINTF(Bus, "Adding a retry to RETRY list %d\n",
+                pktPort->getId());
         addToRetryList(pktPort);
         return false;
     }
diff --git a/src/mem/packet.cc b/src/mem/packet.cc
index 44805236c..1e12ccc20 100644
--- a/src/mem/packet.cc
+++ b/src/mem/packet.cc
@@ -171,11 +171,6 @@ fixPacket(PacketPtr func, PacketPtr timing)
 
     assert(!(funcStart > timingEnd || timingStart > funcEnd));
 
-    if (DTRACE(FunctionalAccess)) {
-       DebugOut() << func;
-       DebugOut() << timing;
-    }
-
     // this packet can't solve our problem, continue on
     if (!timing->hasData())
         return true;