sym53c8xx_2 dev_printk

diff -puN drivers/scsi/sym53c8xx_2/sym_fw.c~sym2-dev_printk drivers/scsi/sym53c8xx_2/sym_fw.c
@@ -409,8 +409,8 @@ void sym_fw_bind_script (hcb_p np, u32 *
 		 *  command.
 		 */
 		if (opcode == 0) {
-			printf ("%s: ERROR0 IN SCRIPT at %d.\n",
-				sym_name(np), (int) (cur-start));
+			sym_printf_err(np, "ERROR0 IN SCRIPT at %d.\n",
+				(int) (cur-start));
 			MDELAY (10000);
 			++cur;
 			continue;

@@ -426,7 +426,7 @@ void sym_fw_bind_script (hcb_p np, u32 *
 		}
 
 		if (DEBUG_FLAGS & DEBUG_SCRIPT)
-			printf ("%d:  <%x>\n", (int) (cur-start),
+			sym_printf_debug(np, "%d:  <%x>\n", (int) (cur-start),
 				(unsigned)opcode);
 
 		/*

@@ -453,8 +453,8 @@ void sym_fw_bind_script (hcb_p np, u32 *
 			tmp1 = cur[1];
 			tmp2 = cur[2];
 			if ((tmp1 ^ tmp2) & 3) {
-				printf ("%s: ERROR1 IN SCRIPT at %d.\n",
-					sym_name(np), (int) (cur-start));
+				sym_printf_err(np, "ERROR1 IN SCRIPT at %d.\n",
+					(int) (cur-start));
 				MDELAY (10000);
 			}
 			/*

273 lines not on this page · raw message

diff -puN drivers/scsi/sym53c8xx_2/sym_glue.h~sym2-dev_printk drivers/scsi/sym53c8xx_2/sym_glue.h
@@ -93,17 +93,38 @@
 #define SYM_OPT_LIMIT_COMMAND_REORDERING
 #define	SYM_OPT_ANNOUNCE_TRANSFER_RATE
 
+#define sym_printk(level, symp, args...)	\
+		dev_printk(level, &(symp)->s.device->dev, ## args)
+
 /*
  *  Print a message with severity.
  */
-#define printf_emerg(args...)	printk(KERN_EMERG args)
-#define	printf_alert(args...)	printk(KERN_ALERT args)
-#define	printf_crit(args...)	printk(KERN_CRIT args)
-#define	printf_err(args...)	printk(KERN_ERR	args)
-#define	printf_warning(args...)	printk(KERN_WARNING args)
-#define	printf_notice(args...)	printk(KERN_NOTICE args)
-#define	printf_info(args...)	printk(KERN_INFO args)
-#define	printf_debug(args...)	printk(KERN_DEBUG args)
+#define sym_printf_emerg(symp, args...)	\
+	sym_printk(KERN_EMERG, symp, args)
+#define	sym_printf_alert(symp, args...)	\
+	sym_printk(KERN_ALERT, symp, args)
+#define	sym_printf_crit(symp, args...)	\
+	sym_printk(KERN_CRIT, symp, args)
+#define	sym_printf_err(symp, args...)	\
+	sym_printk(KERN_ERR, symp, args)
+#define	sym_printf_warning(symp, args...)	\
+	sym_printk(KERN_WARNING, symp, args)
+#define	sym_printf_notice(symp, args...)	\
+	sym_printk(KERN_NOTICE, symp, args)
+#define	sym_printf_info(symp, args...)	\
+	sym_printk(KERN_INFO, symp, args)
+#define	sym_printf_debug(symp, args...)	\
+	sym_printk(KERN_DEBUG, symp, args)
+
+/*
+ * sym_printf: use info level.
+ */
+#define	sym_printf(symp, args...)	sym_printf_info(symp, args)
+
+/*
+ * No prefix or level printf's:
+ */
+#define	printf_debug(symp, args...)	printk(args)
 #define	printf(args...)		printk(args)
 
 /*

397 lines not on this page · raw message

diff -puN drivers/scsi/sym53c8xx_2/sym_misc.c~sym2-dev_printk drivers/scsi/sym53c8xx_2/sym_misc.c
@@ -202,16 +202,16 @@ void sym_announce_transfer_rate(hcb_p np
 			f10 = 100000 << (__tcurr.width ? 1 : 0);
 			mb10 = (f10 + period/2) / period;
 		}
-		printf_info (
-		    "%s:%d: %s %sSCSI %d.%d MB/s %s (%d.%d ns, offset %d)\n",
-		    sym_name(np), target, scsi, __tcurr.width? "WIDE " : "",
+		sym_printf_info(np,
+		    "%d: %s %sSCSI %d.%d MB/s %s (%d.%d ns, offset %d)\n",
+		    target, scsi, __tcurr.width? "WIDE " : "",
 		    mb10/10, mb10%10,
 		    (__tcurr.options & PPR_OPT_DT) ? "DT" : "ST",
 		    period/10, period%10, __tcurr.offset);
 	}
 	else
-		printf_info ("%s:%d: %sasynchronous.\n", 
-		             sym_name(np), target, __tcurr.width? "wide " : "");
+		sym_printf_info(np, "%d: %sasynchronous.\n", target,
+			__tcurr.width? "wide " : "");
 }
 #undef __tprev
 #undef __tcurr

diff -puN drivers/scsi/sym53c8xx_2/sym_nvram.c~sym2-dev_printk drivers/scsi/sym53c8xx_2/sym_nvram.c
@@ -172,8 +172,8 @@ static void sym_display_Symbios_nvram(st
 	int i;
 
 	/* display Symbios nvram host data */
-	printf("%s: HOST ID=%d%s%s%s%s%s%s\n",
-		sym_name(np), nvram->host_id & 0x0f,
+	sym_printf(np, "HOST ID=%d%s%s%s%s%s%s\n",
+		nvram->host_id & 0x0f,
 		(nvram->flags  & SYMBIOS_SCAM_ENABLE)	? " SCAM"	:"",
 		(nvram->flags  & SYMBIOS_PARITY_ENABLE)	? " PARITY"	:"",
 		(nvram->flags  & SYMBIOS_VERBOSE_MSGS)	? " VERBOSE"	:"", 

@@ -184,8 +184,7 @@ static void sym_display_Symbios_nvram(st
 	/* display Symbios nvram drive data */
 	for (i = 0 ; i < 15 ; i++) {
 		struct Symbios_target *tn = &nvram->target[i];
-		printf("%s-%d:%s%s%s%s WIDTH=%d SYNC=%d TMO=%d\n",
-		sym_name(np), i,
+		sym_printf(np, "%d:%s%s%s%s WIDTH=%d SYNC=%d TMO=%d\n", i,
 		(tn->flags & SYMBIOS_DISCONNECT_ENABLE)	? " DISC"	: "",
 		(tn->flags & SYMBIOS_SCAN_AT_BOOT_TIME)	? " SCAN_BOOT"	: "",
 		(tn->flags & SYMBIOS_SCAN_LUNS)		? " SCAN_LUNS"	: "",

@@ -216,8 +215,8 @@ static void sym_display_Tekram_nvram(str
 	case 2: rem = " REMOVABLE=all";		break;
 	}
 
-	printf("%s: HOST ID=%d%s%s%s%s%s%s%s%s%s BOOT DELAY=%d tags=%d\n",
-		sym_name(np), nvram->host_id & 0x0f,
+	sym_printf(np, "HOST ID=%d%s%s%s%s%s%s%s%s%s BOOT DELAY=%d tags=%d\n",
+		nvram->host_id & 0x0f,
 		(nvram->flags1 & SYMBIOS_SCAM_ENABLE)	? " SCAM"	:"",
 		(nvram->flags & TEKRAM_MORE_THAN_2_DRIVES) ? " >2DRIVES":"",
 		(nvram->flags & TEKRAM_DRIVES_SUP_1GB)	? " >1GB"	:"",

@@ -234,8 +233,7 @@ static void sym_display_Tekram_nvram(str
 		struct Tekram_target *tn = &nvram->target[i];
 		j = tn->sync_index & 0xf;
 		sync = Tekram_sync[j];
-		printf("%s-%d:%s%s%s%s%s%s PERIOD=%d\n",
-		sym_name(np), i,
+		sym_printf(np, "%d:%s%s%s%s%s%s PERIOD=%d\n", i,
 		(tn->flags & TEKRAM_PARITY_CHECK)	? " PARITY"	: "",
 		(tn->flags & TEKRAM_SYNC_NEGO)		? " SYNC"	: "",
 		(tn->flags & TEKRAM_DISCONNECT_ENABLE)	? " DISC"	: "",