[openib-general] [PATCH] core_cache.c: Eliminate use of ts_kernel_[services trace].h

[Hal Rosenstock]

core_cache.c: Eliminate use of ts_kernel_[services trace].h

Index: core_cache.c
===================================================================
--- core_cache.c	(revision 871)
+++ core_cache.c	(working copy)
@@ -23,9 +23,6 @@
 
 #include "core_priv.h"
 
-#include "ts_kernel_trace.h"
-#include "ts_kernel_services.h"
-
 #include <linux/version.h>
 #include <linux/module.h>
 
@@ -177,8 +174,8 @@
 		}
 	}
 
-	TS_REPORT_WARN(MOD_KERNEL_IB,
-		       "No match for source GID "
+	printk(KERN_WARNING
+ 			"No match for source GID "
 		       "%02x%02x:%02x%02x:%02x%02x:%02x%02x:"
 		       "%02x%02x:%02x%02x:%02x%02x:%02x%02x",
 		       gid[ 0], gid[ 1], gid[ 2], gid[ 3],
@@ -271,8 +268,8 @@
 	int                        i;
 	int                        ret;
 
-	TS_TRACE(MOD_KERNEL_IB, T_VERY_VERBOSE, TRACE_KERNEL_IB_GEN,
-		 "Updating cached port info for %s port %d",
+	printk(KERN_DEBUG
+       		"Updating cached port info for %s port %d",
 		 device->name, port);
 
 	tprops = kmalloc(sizeof *tprops, GFP_KERNEL);
@@ -281,7 +278,7 @@
 
 	ret = device->query_port(device, port, tprops);
 	if (ret) {
-		TS_REPORT_WARN(MOD_KERNEL_IB,
+		printk(KERN_WARNING
 			       "query_port failed (%d) for %s",
 			       ret, device->name);
 		goto out;
@@ -296,7 +293,7 @@
 	for (i = 0; i < tprops->gid_tbl_len; ++i) {
 		ret = device->query_gid(device, port, i, tgid + i);
 		if (ret) {
-			TS_REPORT_WARN(MOD_KERNEL_IB,
+			printk(KERN_WARNING
 				       "query_gid failed (%d) for %s (index %d)",
 				       ret, device->name, i);
 			goto out;
@@ -313,7 +310,7 @@
 	for (i = 0; i < tprops->pkey_tbl_len; ++i) {
 		ret = device->query_pkey(device, port, i, &tpkey[i]);
 		if (ret) {
-			TS_REPORT_WARN(MOD_KERNEL_IB,
+			printk(KERN_WARNING
 				       "query_pkey failed (%d) for %s, port %d, index %d",
 				       ret, device->name, port, i);
 			goto out;
@@ -384,7 +381,7 @@
 		seqcount_init(&priv->port_data[p].lock);
 		ret = device->query_port(device, p, &prop);
 		if (ret) {
-			TS_REPORT_WARN(MOD_KERNEL_IB,
+			printk(KERN_WARNING
 				       "query_port failed for %s",
 				       device->name);
 			goto error;