mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Remove multiple KERN_ prefixes from printk formats
Commit 5fd29d6ccb ("printk: clean up
handling of log-levels and newlines") changed printk semantics. printk
lines with multiple KERN_<level> prefixes are no longer emitted as
before the patch.
<level> is now included in the output on each additional use.
Remove all uses of multiple KERN_<level>s in formats.
Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
e3288775ff
commit
ad361c9884
70 changed files with 330 additions and 338 deletions
|
|
@ -2826,8 +2826,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd)
|
|||
*/
|
||||
|
||||
local_irq_restore(flags);
|
||||
printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully\n"
|
||||
KERN_INFO " before abortion\n", HOSTNO);
|
||||
printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully before abortion\n", HOSTNO);
|
||||
|
||||
/* Maybe it is sufficient just to release the ST-DMA lock... (if
|
||||
* possible at all) At least, we should check if the lock could be
|
||||
|
|
|
|||
|
|
@ -75,8 +75,9 @@ static int mac53c94_queue(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *
|
|||
int i;
|
||||
printk(KERN_DEBUG "mac53c94_queue %p: command is", cmd);
|
||||
for (i = 0; i < cmd->cmd_len; ++i)
|
||||
printk(" %.2x", cmd->cmnd[i]);
|
||||
printk("\n" KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
|
||||
printk(KERN_CONT " %.2x", cmd->cmnd[i]);
|
||||
printk(KERN_CONT "\n");
|
||||
printk(KERN_DEBUG "use_sg=%d request_bufflen=%d request_buffer=%p\n",
|
||||
scsi_sg_count(cmd), scsi_bufflen(cmd), scsi_sglist(cmd));
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -619,7 +619,7 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
|
|||
if (strcmp(current->comm, cmd) && printk_ratelimit()) {
|
||||
printk(KERN_WARNING
|
||||
"sg_write: data in/out %d/%d bytes for SCSI command 0x%x--"
|
||||
"guessing data in;\n" KERN_WARNING " "
|
||||
"guessing data in;\n "
|
||||
"program %s not setting count and/or reply_len properly\n",
|
||||
old_hdr.reply_len - (int)SZ_SG_HEADER,
|
||||
input_size, (unsigned int) cmnd[0],
|
||||
|
|
|
|||
|
|
@ -2860,8 +2860,7 @@ static int NCR5380_abort(struct scsi_cmnd *cmd)
|
|||
*/
|
||||
|
||||
local_irq_restore(flags);
|
||||
printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully\n"
|
||||
KERN_INFO " before abortion\n", HOSTNO);
|
||||
printk(KERN_INFO "scsi%d: warning : SCSI command probably completed successfully before abortion\n", HOSTNO);
|
||||
|
||||
return SCSI_ABORT_NOT_RUNNING;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue