tty: vt: use enum constants for VESA blanking modes

Use the new enum for VESA constants. This improves type checking in
consw::con_blank().

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-parisc@vger.kernel.org
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-35-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 0d5d7b5074a43a6565916326fe58a911bb63f08e..de9148094c2ddfb36b044766078388f4c5da45ca 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -175,7 +175,7 @@ int do_poke_blanked_console;
 int console_blanked;
 EXPORT_SYMBOL(console_blanked);
 
-static int vesa_blank_mode; /* 0:none 1:suspendV 2:suspendH 3:powerdown */
+static enum vesa_blank_mode vesa_blank_mode;
 static int vesa_off_interval;
 static int blankinterval;
 core_param(consoleblank, blankinterval, int, 0444);
@@ -4320,7 +4320,7 @@ static int set_vesa_blanking(u8 __user *mode_user)
                return -EFAULT;
 
        console_lock();
-       vesa_blank_mode = (mode < 4) ? mode : VESA_NO_BLANKING;
+       vesa_blank_mode = (mode <= VESA_BLANK_MAX) ? mode : VESA_NO_BLANKING;
        console_unlock();
 
        return 0;

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index c8d5aa0e3ed0aa87e7173f92c6d32de320d200ed..d86c1d79869078638dd7c8015c778d5a08d89d5f 100644 (file)
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -79,7 +79,8 @@ static void dummycon_putcs(struct vc_data *vc, const u16 *s, unsigned int count,
        raw_notifier_call_chain(&dummycon_output_nh, 0, NULL);
 }
 
-static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch)
+static int dummycon_blank(struct vc_data *vc, enum vesa_blank_mode blank,
+                         int mode_switch)
 {
        /* Redraw, so that we get putc(s) for output done while blanked */
        return 1;
@@ -89,7 +90,8 @@ static void dummycon_putc(struct vc_data *vc, u16 c, unsigned int y,
                          unsigned int x) { }
 static void dummycon_putcs(struct vc_data *vc, const u16 *s, unsigned int count,
                           unsigned int ypos, unsigned int xpos) { }
-static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch)
+static int dummycon_blank(struct vc_data *vc, enum vesa_blank_mode blank,
+                         int mode_switch)
 {
        return 0;
 }

diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index 4485ef923bb338c108c43ad602fd6c243948edc0..63e3ce678aabfa3ca26dbcb32fbfa8402823beeb 100644 (file)
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -451,7 +451,8 @@ static bool mdacon_switch(struct vc_data *c)
        return true;    /* redrawing needed */
 }
 
-static int mdacon_blank(struct vc_data *c, int blank, int mode_switch)
+static int mdacon_blank(struct vc_data *c, enum vesa_blank_mode blank,
+                       int mode_switch)
 {
        if (mda_type == TYPE_MDA) {
                if (blank) 

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index ad3a09142770e7f6989ddb1e36e9b4c73b88a832..38437a53b7f1180d42b51031664c072e694c68a1 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -476,7 +476,8 @@ static bool newport_switch(struct vc_data *vc)
        return true;
 }
 
-static int newport_blank(struct vc_data *c, int blank, int mode_switch)
+static int newport_blank(struct vc_data *c, enum vesa_blank_mode blank,
+                        int mode_switch)
 {
        unsigned short treg;
 

diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 817b89c45e8164453065144eca5e7ca630ae62ab..e9d5d1f92883504645ae9097cb92e79b10544c3d 100644 (file)
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -298,7 +298,8 @@ static bool sticon_switch(struct vc_data *conp)
     return true;       /* needs refreshing */
 }
 
-static int sticon_blank(struct vc_data *c, int blank, int mode_switch)
+static int sticon_blank(struct vc_data *c, enum vesa_blank_mode blank,
+                       int mode_switch)
 {
     if (blank == VESA_NO_BLANKING) {
        if (mode_switch)

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 02eccd9b3542cb0a5bc66d3b33457591885f179f..84f3682704c7cf9f4dbf3b8ea5dcad4def3e0d70 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -81,7 +81,7 @@ static unsigned int   vga_video_num_lines;                    /* Number of text lines */
 static bool            vga_can_do_color;                       /* Do we support colors? */
 static unsigned int    vga_default_font_height __read_mostly;  /* Height of default screen font */
 static unsigned char   vga_video_type          __read_mostly;  /* Card type */
-static int             vga_vesa_blanked;
+static enum vesa_blank_mode vga_vesa_blanked;
 static bool            vga_palette_blanked;
 static bool            vga_is_gfx;
 static bool            vga_512_chars;
@@ -683,7 +683,7 @@ static struct {
        unsigned char ClockingMode;     /* Seq-Controller:01h */
 } vga_state;
 
-static void vga_vesa_blank(struct vgastate *state, int mode)
+static void vga_vesa_blank(struct vgastate *state, enum vesa_blank_mode mode)
 {
        /* save original values of VGA controller registers */
        if (!vga_vesa_blanked) {
@@ -797,7 +797,8 @@ static void vga_pal_blank(struct vgastate *state)
        }
 }
 
-static int vgacon_blank(struct vc_data *c, int blank, int mode_switch)
+static int vgacon_blank(struct vc_data *c, enum vesa_blank_mode blank,
+                       int mode_switch)
 {
        switch (blank) {
        case VESA_NO_BLANKING:          /* Unblank */

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index d5d924225209aad15386f99359f4bbfab0838b83..69be5f2106bc6c88d7302a4d84bdd1882737124c 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2198,7 +2198,8 @@ static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
        }
 }
 
-static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
+static int fbcon_blank(struct vc_data *vc, enum vesa_blank_mode blank,
+                      int mode_switch)
 {
        struct fb_info *info = fbcon_info_from_console(vc->vc_num);
        struct fbcon_ops *ops = info->fbcon_par;

diff --git a/include/linux/console.h b/include/linux/console.h
index 860f82756c9c9b78c0742f7feacd6f8148b8ec80..69040d7c8f9744ce226539354665137df48462e2 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -70,7 +70,8 @@ struct consw {
                        unsigned int bottom, enum con_scroll dir,
                        unsigned int lines);
        bool    (*con_switch)(struct vc_data *vc);
-       int     (*con_blank)(struct vc_data *vc, int blank, int mode_switch);
+       int     (*con_blank)(struct vc_data *vc, enum vesa_blank_mode blank,
+                            int mode_switch);
        int     (*con_font_set)(struct vc_data *vc, struct console_font *font,
                        unsigned int vpitch, unsigned int flags);
        int     (*con_font_get)(struct vc_data *vc, struct console_font *font,