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
|
|
@ -226,9 +226,10 @@ static int clcdfb_set_par(struct fb_info *info)
|
|||
clcdfb_enable(fb, regs.cntl);
|
||||
|
||||
#ifdef DEBUG
|
||||
printk(KERN_INFO "CLCD: Registers set to\n"
|
||||
KERN_INFO " %08x %08x %08x %08x\n"
|
||||
KERN_INFO " %08x %08x %08x %08x\n",
|
||||
printk(KERN_INFO
|
||||
"CLCD: Registers set to\n"
|
||||
" %08x %08x %08x %08x\n"
|
||||
" %08x %08x %08x %08x\n",
|
||||
readl(fb->regs + CLCD_TIM0), readl(fb->regs + CLCD_TIM1),
|
||||
readl(fb->regs + CLCD_TIM2), readl(fb->regs + CLCD_TIM3),
|
||||
readl(fb->regs + CLCD_UBAS), readl(fb->regs + CLCD_LBAS),
|
||||
|
|
|
|||
|
|
@ -454,9 +454,9 @@ static void DAC1064_restore_2(WPMINFO2) {
|
|||
dprintk(KERN_DEBUG "DAC1064regs ");
|
||||
for (i = 0; i < sizeof(MGA1064_DAC_regs); i++) {
|
||||
dprintk("R%02X=%02X ", MGA1064_DAC_regs[i], ACCESS_FBINFO(hw).DACreg[i]);
|
||||
if ((i & 0x7) == 0x7) dprintk("\n" KERN_DEBUG "continuing... ");
|
||||
if ((i & 0x7) == 0x7) dprintk(KERN_DEBUG "continuing... ");
|
||||
}
|
||||
dprintk("\n" KERN_DEBUG "DAC1064clk ");
|
||||
dprintk(KERN_DEBUG "DAC1064clk ");
|
||||
for (i = 0; i < 6; i++)
|
||||
dprintk("C%02X=%02X ", i, ACCESS_FBINFO(hw).DACclk[i]);
|
||||
dprintk("\n");
|
||||
|
|
|
|||
|
|
@ -651,9 +651,9 @@ static void Ti3026_restore(WPMINFO2) {
|
|||
dprintk(KERN_DEBUG "3026DACregs ");
|
||||
for (i = 0; i < 21; i++) {
|
||||
dprintk("R%02X=%02X ", DACseq[i], hw->DACreg[i]);
|
||||
if ((i & 0x7) == 0x7) dprintk("\n" KERN_DEBUG "continuing... ");
|
||||
if ((i & 0x7) == 0x7) dprintk(KERN_DEBUG "continuing... ");
|
||||
}
|
||||
dprintk("\n" KERN_DEBUG "DACclk ");
|
||||
dprintk(KERN_DEBUG "DACclk ");
|
||||
for (i = 0; i < 6; i++)
|
||||
dprintk("C%02X=%02X ", i, hw->DACclk[i]);
|
||||
dprintk("\n");
|
||||
|
|
|
|||
|
|
@ -1115,10 +1115,9 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
|||
if the device name contains the string "DX" and tell the
|
||||
user how to reconfigure the card. */
|
||||
if (strstr(sti->outptr.dev_name, "DX")) {
|
||||
printk(KERN_WARNING "WARNING: stifb framebuffer driver does not "
|
||||
"support '%s' in double-buffer mode.\n"
|
||||
KERN_WARNING "WARNING: Please disable the double-buffer mode "
|
||||
"in IPL menu (the PARISC-BIOS).\n",
|
||||
printk(KERN_WARNING
|
||||
"WARNING: stifb framebuffer driver does not support '%s' in double-buffer mode.\n"
|
||||
"WARNING: Please disable the double-buffer mode in IPL menu (the PARISC-BIOS).\n",
|
||||
sti->outptr.dev_name);
|
||||
goto out_err0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue