newport_con: vc_color is now in state

Since commit 28bc24fc46f9 (vc: separate state), vc->vc_color is known as
vc->state.color. Somehow both me and 0-day bot missed this driver during
the conversion.

So fix the driver now.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 28bc24fc46f9 ("vc: separate state")
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Link: https://lore.kernel.org/r/20200724062735.18229-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index 504cda38763e01dfde1543e66d46733ec8695e31..d9fa6b5317ab0c63bb4720f4100d4f41a59977e8 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -359,12 +359,12 @@ static void newport_clear(struct vc_data *vc, int sy, int sx, int height,
 
        if (ystart < yend) {
                newport_clear_screen(sx << 3, ystart, xend, yend,
-                                    (vc->vc_color & 0xf0) >> 4);
+                                    (vc->state.color & 0xf0) >> 4);
        } else {
                newport_clear_screen(sx << 3, ystart, xend, 1023,
-                                    (vc->vc_color & 0xf0) >> 4);
+                                    (vc->state.color & 0xf0) >> 4);
                newport_clear_screen(sx << 3, 0, xend, yend,
-                                    (vc->vc_color & 0xf0) >> 4);
+                                    (vc->state.color & 0xf0) >> 4);
        }
 }
 
@@ -588,11 +588,11 @@ static bool newport_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
                        topscan = (topscan + (lines << 4)) & 0x3ff;
                        newport_clear_lines(vc->vc_rows - lines,
                                            vc->vc_rows - 1,
-                                           (vc->vc_color & 0xf0) >> 4);
+                                           (vc->state.color & 0xf0) >> 4);
                } else {
                        topscan = (topscan + (-lines << 4)) & 0x3ff;
                        newport_clear_lines(0, lines - 1,
-                                           (vc->vc_color & 0xf0) >> 4);
+                                           (vc->state.color & 0xf0) >> 4);
                }
                npregs->cset.topscan = (topscan - 1) & 0x3ff;
                return false;