[PATCH 40/49] drivers/staging/slicoss: Convert printks to pr_<level>

[Joe Perches <joe@xxxxxxxxxxx>]

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/slicoss/slicoss.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index e67a130..97affc8 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -54,6 +54,7 @@
  *       IS-NIC driver.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #define KLUDGE_FOR_4GB_BOUNDARY         1
 #define DEBUG_MICROCODE                 1
@@ -183,7 +184,6 @@ static struct dentry *slic_debugfs;
 		"Non-Accelerated Driver"
 #define DRV_COPYRIGHT     "Copyright  2000-2006 Alacritech, Inc. "\
 		"All rights reserved."
-#define PFX		   DRV_NAME " "
 
 MODULE_AUTHOR(DRV_AUTHOR);
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
@@ -213,8 +213,8 @@ MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
 #ifndef ASSERT
 #define ASSERT(a) do {							\
 	if (!(a)) {							\
-		printk(KERN_ERR "slicoss ASSERT() Failure: function %s"	\
-			"line %d\n", __func__, __LINE__);		\
+		pr_err("ASSERT() Failure: function %s"			\
+		       "line %d\n", __func__, __LINE__);		\
 		slic_assert_fail();					\
 	}								\
 } while (0)
@@ -2603,7 +2603,7 @@ static void slic_assert_fail(void)
 	cpuid = smp_processor_id();
 	curr_pid = current->pid;
 
-	printk(KERN_ERR "%s CPU # %d ---- PID # %d\n",
+	pr_err("%s CPU # %d ---- PID # %d\n",
 	       __func__, cpuid, curr_pid);
 }
 
@@ -3962,7 +3962,7 @@ static void slic_debug_adapter_create(struct adapter *adapter)
 				card->debugfs_dir, adapter,
 				&slic_debug_adapter_fops);
 	if (!d || IS_ERR(d))
-		pr_info(PFX "%s: debugfs create failed\n", name);
+		pr_info("%s: debugfs create failed\n", name);
 	else
 		adapter->debugfs_entry = d;
 }
@@ -3983,16 +3983,14 @@ static void slic_debug_card_create(struct sliccard *card)
 	snprintf(name, sizeof(name), "slic%d", card->cardnum);
 	d = debugfs_create_dir(name, slic_debugfs);
 	if (!d || IS_ERR(d))
-		pr_info(PFX "%s: debugfs create dir failed\n",
-				name);
+		pr_info("%s: debugfs create dir failed\n", name);
 	else {
 		card->debugfs_dir = d;
 		d = debugfs_create_file("cardinfo", S_IRUGO,
 				slic_debugfs, card,
 				&slic_debug_card_fops);
 		if (!d || IS_ERR(d))
-			pr_info(PFX "%s: debugfs create failed\n",
-					name);
+			pr_info("%s: debugfs create failed\n", name);
 		else
 			card->debugfs_cardinfo = d;
 	}
@@ -4025,7 +4023,7 @@ static void slic_debug_init(void)
 
 	ent = debugfs_create_dir("slic", NULL);
 	if (!ent || IS_ERR(ent)) {
-		pr_info(PFX "debugfs create directory failed\n");
+		pr_info("debugfs create directory failed\n");
 		return;
 	}
 
-- 
1.6.5.rc3.dirty

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel