Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

atyfb: fix debugging printks

This patch fixes the debugging printks. Use pr_cont, so that the lines are
not broken up. Use printk when starting a new line (a long string of
pr_cont's without any printks causes missing characters in the console
output on sparc).

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

authored by

Mikulas Patocka and committed by
Bartlomiej Zolnierkiewicz
ee6fbb20 01c40a17

+20 -16
+20 -16
drivers/video/fbdev/aty/atyfb_base.c
··· 1480 1480 base = 0x2000; 1481 1481 printk("debug atyfb: Mach64 non-shadow register values:"); 1482 1482 for (i = 0; i < 256; i = i+4) { 1483 - if (i % 16 == 0) 1484 - printk("\ndebug atyfb: 0x%04X: ", base + i); 1485 - printk(" %08X", aty_ld_le32(i, par)); 1483 + if (i % 16 == 0) { 1484 + pr_cont("\n"); 1485 + printk("debug atyfb: 0x%04X: ", base + i); 1486 + } 1487 + pr_cont(" %08X", aty_ld_le32(i, par)); 1486 1488 } 1487 - printk("\n\n"); 1489 + pr_cont("\n\n"); 1488 1490 1489 1491 #ifdef CONFIG_FB_ATY_CT 1490 1492 /* PLL registers */ 1491 1493 base = 0x00; 1492 1494 printk("debug atyfb: Mach64 PLL register values:"); 1493 1495 for (i = 0; i < 64; i++) { 1494 - if (i % 16 == 0) 1495 - printk("\ndebug atyfb: 0x%02X: ", base + i); 1496 + if (i % 16 == 0) { 1497 + pr_cont("\n"); 1498 + printk("debug atyfb: 0x%02X: ", base + i); 1499 + } 1496 1500 if (i % 4 == 0) 1497 - printk(" "); 1498 - printk("%02X", aty_ld_pll_ct(i, par)); 1501 + pr_cont(" "); 1502 + pr_cont("%02X", aty_ld_pll_ct(i, par)); 1499 1503 } 1500 - printk("\n\n"); 1504 + pr_cont("\n\n"); 1501 1505 #endif /* CONFIG_FB_ATY_CT */ 1502 1506 1503 1507 #ifdef CONFIG_FB_ATY_GENERIC_LCD ··· 1513 1509 for (i = 0; i <= POWER_MANAGEMENT; i++) { 1514 1510 if (i == EXT_VERT_STRETCH) 1515 1511 continue; 1516 - printk("\ndebug atyfb: 0x%04X: ", 1512 + pr_cont("\ndebug atyfb: 0x%04X: ", 1517 1513 lt_lcd_regs[i]); 1518 - printk(" %08X", aty_ld_lcd(i, par)); 1514 + pr_cont(" %08X", aty_ld_lcd(i, par)); 1519 1515 } 1520 1516 } else { 1521 1517 for (i = 0; i < 64; i++) { 1522 1518 if (i % 4 == 0) 1523 - printk("\ndebug atyfb: 0x%02X: ", 1519 + pr_cont("\ndebug atyfb: 0x%02X: ", 1524 1520 base + i); 1525 - printk(" %08X", aty_ld_lcd(i, par)); 1521 + pr_cont(" %08X", aty_ld_lcd(i, par)); 1526 1522 } 1527 1523 } 1528 - printk("\n\n"); 1524 + pr_cont("\n\n"); 1529 1525 } 1530 1526 #endif /* CONFIG_FB_ATY_GENERIC_LCD */ 1531 1527 } ··· 2601 2597 aty_ld_le32(DSP_ON_OFF, par), 2602 2598 aty_ld_le32(CLOCK_CNTL, par)); 2603 2599 for (i = 0; i < 40; i++) 2604 - printk(" %02x", aty_ld_pll_ct(i, par)); 2605 - printk("\n"); 2600 + pr_cont(" %02x", aty_ld_pll_ct(i, par)); 2601 + pr_cont("\n"); 2606 2602 } 2607 2603 #endif 2608 2604 if (par->pll_ops->init_pll)