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>

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 05111e90f1681c0e40a8438c5eb427ff25f9ffc3..b6fe103df1453ef1417cf36f306932d5410593f3 100644 (file)
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -1480,24 +1480,28 @@ static int atyfb_set_par(struct fb_info *info)
        base = 0x2000;
        printk("debug atyfb: Mach64 non-shadow register values:");
        for (i = 0; i < 256; i = i+4) {
-               if (i % 16 == 0)
-                       printk("\ndebug atyfb: 0x%04X: ", base + i);
-               printk(" %08X", aty_ld_le32(i, par));
+               if (i % 16 == 0) {
+                       pr_cont("\n");
+                       printk("debug atyfb: 0x%04X: ", base + i);
+               }
+               pr_cont(" %08X", aty_ld_le32(i, par));
        }
-       printk("\n\n");
+       pr_cont("\n\n");
 
 #ifdef CONFIG_FB_ATY_CT
        /* PLL registers */
        base = 0x00;
        printk("debug atyfb: Mach64 PLL register values:");
        for (i = 0; i < 64; i++) {
-               if (i % 16 == 0)
-                       printk("\ndebug atyfb: 0x%02X: ", base + i);
+               if (i % 16 == 0) {
+                       pr_cont("\n");
+                       printk("debug atyfb: 0x%02X: ", base + i);
+               }
                if (i % 4 == 0)
-                       printk(" ");
-               printk("%02X", aty_ld_pll_ct(i, par));
+                       pr_cont(" ");
+               pr_cont("%02X", aty_ld_pll_ct(i, par));
        }
-       printk("\n\n");
+       pr_cont("\n\n");
 #endif /* CONFIG_FB_ATY_CT */
 
 #ifdef CONFIG_FB_ATY_GENERIC_LCD
@@ -1509,19 +1513,19 @@ static int atyfb_set_par(struct fb_info *info)
                        for (i = 0; i <= POWER_MANAGEMENT; i++) {
                                if (i == EXT_VERT_STRETCH)
                                        continue;
-                               printk("\ndebug atyfb: 0x%04X: ",
+                               pr_cont("\ndebug atyfb: 0x%04X: ",
                                       lt_lcd_regs[i]);
-                               printk(" %08X", aty_ld_lcd(i, par));
+                               pr_cont(" %08X", aty_ld_lcd(i, par));
                        }
                } else {
                        for (i = 0; i < 64; i++) {
                                if (i % 4 == 0)
-                                       printk("\ndebug atyfb: 0x%02X: ",
+                                       pr_cont("\ndebug atyfb: 0x%02X: ",
                                               base + i);
-                               printk(" %08X", aty_ld_lcd(i, par));
+                               pr_cont(" %08X", aty_ld_lcd(i, par));
                        }
                }
-               printk("\n\n");
+               pr_cont("\n\n");
        }
 #endif /* CONFIG_FB_ATY_GENERIC_LCD */
 }
@@ -2597,8 +2601,8 @@ static int aty_init(struct fb_info *info)
                       aty_ld_le32(DSP_ON_OFF, par),
                       aty_ld_le32(CLOCK_CNTL, par));
                for (i = 0; i < 40; i++)
-                       printk(" %02x", aty_ld_pll_ct(i, par));
-               printk("\n");
+                       pr_cont(" %02x", aty_ld_pll_ct(i, par));
+               pr_cont("\n");
        }
 #endif
        if (par->pll_ops->init_pll)