Skip to contentSkip to conversation

drivers/block/DAC960.c: Add KERN_* to printk statements

PATCH In review Richard 2 participants 2 messages Jul 7, 2006

Subsystems (2)
lore
Share & tools
lore

Richard

author
#0 lore raw

PATCH 1/1 drivers/block/DAC960.c: Add KERN_* to printk statements

Add KERN_* to printk statements

Signed-off-by Richard van Berkum <h.vanberkum at chello.nl>

---

It's a bit hard to track if there are any linefeeds at the end of the printk statements. It's possible that the linefeeds are in the @Buffer variable. I don't know.

 drivers/block/DAC960.c |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/block/DAC960.c +13 -12
@@ -2519,7 +2519,7 @@ static boolean DAC960_RegisterBlockDevic
 	/* for now, let all request queues share controller's lock */
   	RequestQueue = blk_init_queue(DAC960_RequestFunction,&Controller->queue_lock);
   	if (!RequestQueue) {
-		printk("DAC960: failure to allocate request queue\n");
+		printk(KERN_INFO "DAC960: failure to allocate request queue\n");
 		continue;
   	}
   	Controller->RequestQueue[n] = RequestQueue;
@@ -3590,7 +3590,7 @@ static void DAC960_V1_ProcessCompletedCo
 
 #ifdef FORCE_RETRY_FAILURE_DEBUG
       if (!(++retry_count % 10000)) {
-	      printk("V1 error retry failure test\n");
+	      printk(KERN_DEBUG "V1 error retry failure test\n");
 	      normal_completion = false;
               DAC960_V1_ReadWriteError(Command);
       }
@@ -4678,7 +4678,7 @@ static void DAC960_V2_ProcessCompletedCo
 
 #ifdef FORCE_RETRY_FAILURE_DEBUG
       if (!(++retry_count % 10000)) {
-	      printk("V2 error retry failure test\n");
+	      printk(KERN_DEBUG "V2 error retry failure test\n");
 	      normal_completion = false;
 	      DAC960_V2_ReadWriteError(Command);
       }
@@ -5759,7 +5759,7 @@ static void DAC960_Message(DAC960_Messag
   Length = vsprintf(Buffer, Format, Arguments);
   va_end(Arguments);
   if (Controller = NULL)
-    printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
+    printk(KERN_INFO "%sDAC960#%d: %s\n", DAC960_MessageLevelMap[MessageLevel],
 	   DAC960_ControllerCount, Buffer);
   else if (MessageLevel = DAC960_AnnounceLevel ||
 	   MessageLevel = DAC960_InfoLevel)
@@ -5780,7 +5780,7 @@ static void DAC960_Message(DAC960_Messag
 	    {
 	      static int AnnouncementLines = 0;
 	      if (++AnnouncementLines <= 2)
-		printk("%sDAC960: %s", DAC960_MessageLevelMap[MessageLevel],
+		printk(KERN_INFO "%sDAC960: %s\n", DAC960_MessageLevelMap[MessageLevel],
 		       Buffer);
 	    }
 	  else
@@ -5788,11 +5788,11 @@ static void DAC960_Message(DAC960_Messag
 	      if (BeginningOfLine)
 		{
 		  if (Buffer[0] != '\n' || Length > 1)
-		    printk("%sDAC960#%d: %s",
+		    printk(KERN_INFO "%sDAC960#%d: %s\n",
 			   DAC960_MessageLevelMap[MessageLevel],
 			   Controller->ControllerNumber, Buffer);
 		}
-	      else printk("%s", Buffer);
+	      else printk(KERN_INFO "%s\n", Buffer);
 	    }
 	}
       else if (DAC960_CheckStatusBuffer(Controller, Length))
@@ -5811,12 +5811,12 @@ static void DAC960_Message(DAC960_Messag
 	  if (time_after_eq(jiffies, Controller->LastProgressReportTime
 	      + DAC960_ProgressReportingInterval))
 	    {
-	      printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
+	      printk(KERN_INFO "%sDAC960#%d: %s\n", DAC960_MessageLevelMap[MessageLevel],
 		     Controller->ControllerNumber, Buffer);
 	      Controller->LastProgressReportTime = jiffies;
 	    }
 	}
-      else printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
+      else printk(KERN_INFO "%sDAC960#%d: %s\n", DAC960_MessageLevelMap[MessageLevel],
 		  Controller->ControllerNumber, Buffer);
     }
   else if (MessageLevel = DAC960_UserCriticalLevel)
@@ -5825,16 +5825,17 @@ static void DAC960_Message(DAC960_Messag
 	     Buffer);
       Controller->UserStatusLength += Length;
       if (Buffer[0] != '\n' || Length > 1)
-	printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
+	printk(KERN_INFO "%sDAC960#%d: %s\n", DAC960_MessageLevelMap[MessageLevel],
 	       Controller->ControllerNumber, Buffer);
     }
   else
     {
       if (BeginningOfLine)
-	printk("%sDAC960#%d: %s", DAC960_MessageLevelMap[MessageLevel],
+	printk(KERN_INFO "%sDAC960#%d: %s\n", DAC960_MessageLevelMap[MessageLevel],
 	       Controller->ControllerNumber, Buffer);
-      else printk("%s", Buffer);
+      else printk(KERN_INFO "%s\n", Buffer);
     }
+  
   BeginningOfLine = (Buffer[Length-1] = '\n');
 }
 

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors