Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / sti / sti_hdmi.c

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 243905b6ae59034cf5ad4711f4703e63ba67a6bc..a59c95a8081b7acce1161b6dca34e027b8975825 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -592,7 +592,7 @@ static void hdmi_dbg_cfg(struct seq_file *s, int val)
 {
        int tmp;
 
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        tmp = val & HDMI_CFG_HDMI_NOT_DVI;
        DBGFS_PRINT_STR("mode:", tmp ? "HDMI" : "DVI");
        seq_puts(s, "\t\t\t\t\t");
@@ -616,7 +616,7 @@ static void hdmi_dbg_sta(struct seq_file *s, int val)
 {
        int tmp;
 
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        tmp = (val & HDMI_STA_DLL_LCK);
        DBGFS_PRINT_STR("pll:", tmp ? "locked" : "not locked");
        seq_puts(s, "\t\t\t\t\t");
@@ -632,7 +632,7 @@ static void hdmi_dbg_sw_di_cfg(struct seq_file *s, int val)
                               "once every field",
                               "once every frame"};
 
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        tmp = (val & HDMI_IFRAME_CFG_DI_N(HDMI_IFRAME_MASK, 1));
        DBGFS_PRINT_STR("Data island 1:", en_di[tmp]);
        seq_puts(s, "\t\t\t\t\t");
@@ -664,16 +664,16 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
        DBGFS_DUMP("\n", HDMI_STA);
        hdmi_dbg_sta(s, hdmi_read(hdmi, HDMI_STA));
        DBGFS_DUMP("", HDMI_ACTIVE_VID_XMIN);
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        DBGFS_PRINT_INT("Xmin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMIN));
        DBGFS_DUMP("", HDMI_ACTIVE_VID_XMAX);
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        DBGFS_PRINT_INT("Xmax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_XMAX));
        DBGFS_DUMP("", HDMI_ACTIVE_VID_YMIN);
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        DBGFS_PRINT_INT("Ymin:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMIN));
        DBGFS_DUMP("", HDMI_ACTIVE_VID_YMAX);
-       seq_puts(s, "\t");
+       seq_putc(s, '\t');
        DBGFS_PRINT_INT("Ymax:", hdmi_read(hdmi, HDMI_ACTIVE_VID_YMAX));
        DBGFS_DUMP("", HDMI_SW_DI_CFG);
        hdmi_dbg_sw_di_cfg(s, hdmi_read(hdmi, HDMI_SW_DI_CFG));
@@ -692,8 +692,7 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD4, HDMI_IFRAME_SLOT_AVI);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD5, HDMI_IFRAME_SLOT_AVI);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_AVI);
-       seq_puts(s, "\n");
-       seq_printf(s, "\n AUDIO Infoframe (Data Island slot N=%d):",
+       seq_printf(s, "\n\n AUDIO Infoframe (Data Island slot N=%d):",
                   HDMI_IFRAME_SLOT_AUDIO);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_HEAD_WORD, HDMI_IFRAME_SLOT_AUDIO);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD0, HDMI_IFRAME_SLOT_AUDIO);
@@ -703,8 +702,7 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD4, HDMI_IFRAME_SLOT_AUDIO);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD5, HDMI_IFRAME_SLOT_AUDIO);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_AUDIO);
-       seq_puts(s, "\n");
-       seq_printf(s, "\n VENDOR SPECIFIC Infoframe (Data Island slot N=%d):",
+       seq_printf(s, "\n\n VENDOR SPECIFIC Infoframe (Data Island slot N=%d):",
                   HDMI_IFRAME_SLOT_VENDOR);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_HEAD_WORD, HDMI_IFRAME_SLOT_VENDOR);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD0, HDMI_IFRAME_SLOT_VENDOR);
@@ -714,8 +712,7 @@ static int hdmi_dbg_show(struct seq_file *s, void *data)
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD4, HDMI_IFRAME_SLOT_VENDOR);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD5, HDMI_IFRAME_SLOT_VENDOR);
        DBGFS_DUMP_DI(HDMI_SW_DI_N_PKT_WORD6, HDMI_IFRAME_SLOT_VENDOR);
-       seq_puts(s, "\n");
-
+       seq_putc(s, '\n');
        return 0;
 }