userspace/rtud: get rid of TRACE_DBG

This was a build-time conditional. It is now a run-time conditional using wrs-msg. As a result, we have a verbose rtud. Fixed in next commit. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace/rtud: get rid of TRACE_DBG
This was a build-time conditional. It is now a run-time conditional using wrs-msg. As a result, we have a verbose rtud. Fixed in next commit. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
0f4e404c · Alessandro Rubini · Adam Wujek · 8dd0d65b · 0f4e404c · 0f4e404c
Commit 0f4e404c authored Jan 12, 2015 by Alessandro Rubini Committed by Adam Wujek Jan 16, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 12 deletions

rtu.h userspace/wrsw_rtud/rtu.h +0 -6

rtu_drv.c userspace/wrsw_rtud/rtu_drv.c +4 -5

rtu_fd.c userspace/wrsw_rtud/rtu_fd.c +1 -1

No files found.
--- a/userspace/wrsw_rtud/rtu.h
+++ b/userspace/wrsw_rtud/rtu.h
@@ -64,12 +64,6 @@
 // Keeping in mind year 2038
 #define time_after(a,b) ((long)(b) - (long)(a) < 0)
-#ifdef TRACE_ALL
-#define TRACE_DBG(...) TRACE(__VA_ARGS__)
-#else
-#define TRACE_DBG(...)
-#endif
 /* RTU entry address */
 struct rtu_addr {
 	int hash;

--- a/userspace/wrsw_rtud/rtu_drv.c
+++ b/userspace/wrsw_rtud/rtu_drv.c
@@ -306,8 +306,7 @@ void rtu_write_htab_entry(uint16_t zbt_addr, struct filtering_entry *ent,
 	if (flush)
 		flush_mfifo();
-	TRACE_DBG(TRACE_INFO,
+	pr_debug("write htab entry [with flush]: addr %x ent %08x %08x %08x %08x %08x",
-		  "write htab entry [with flush]: addr %x ent %08x %08x %08x %08x %08x",
 		  zbt_addr,
 		  mac_entry_word0_w(ent),
 		  mac_entry_word1_w(ent),
@@ -415,7 +414,7 @@ void rtu_enable(void)
 {
 	uint32_t gcr = rtu_rd(GCR);
 	rtu_wr(GCR, gcr | RTU_GCR_G_ENA);
-	TRACE_DBG(TRACE_INFO, "updated gcr (enable): %x\n", gcr);
+	pr_debug("updated gcr (enable): %x\n", gcr);
 }
 /**
@@ -425,7 +424,7 @@ void rtu_disable(void)
 {
 	uint32_t gcr = rtu_rd(GCR);
 	rtu_wr(GCR, gcr & (~RTU_GCR_G_ENA));
-	TRACE_DBG(TRACE_INFO, "updated gcr (disable): %x\n", gcr);
+	pr_debug("updated gcr (disable): %x\n", gcr);
 }
 /**
@@ -450,7 +449,7 @@ void rtu_write_hash_poly(uint16_t hash_poly)
 	gcr = (gcr & (~RTU_GCR_POLY_VAL_MASK)) | RTU_GCR_POLY_VAL_W(hash_poly);
 	// Update GCR
 	rtu_wr(GCR, gcr);
-	TRACE_DBG(TRACE_INFO, "updated gcr (poly): %x\n", gcr);
+	pr_debug("updated gcr (poly): %x\n", gcr);
 }
 // PORT SETTINGS

--- a/userspace/wrsw_rtud/rtu_fd.c
+++ b/userspace/wrsw_rtud/rtu_fd.c
@@ -195,7 +195,7 @@ int rtu_fd_create_entry(uint8_t mac[ETH_ALEN], uint16_t vid, uint32_t port_mask,
 		/* Case 1: entry already present in the hashtable */
 		if (htab_search(mac, fid, &ent)) {
-			TRACE_DBG(TRACE_INFO, "Entry for mac %s already found.",
+			pr_debug("Entry for mac %s already found.",
 				  mac_to_string(mac));
 			if (at_existing_entry == ADD_TO_EXISTING)	// enable multipath for redundancy