tty: vt: make font of consw::con_font_set() const

Provided the font parameter of consw::con_font_set() is not supposed to
be changed, make it const.

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-37-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 de9148094c2ddfb36b044766078388f4c5da45ca..0ac537f82f7ad27f45c38175064c8da78a464696 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -4625,7 +4625,7 @@ out:
        return rc;
 }
 
-static int con_font_set(struct vc_data *vc, struct console_font_op *op)
+static int con_font_set(struct vc_data *vc, const struct console_font_op *op)
 {
        struct console_font font;
        int rc = -EINVAL;

diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c
index dbb31bf87bf1cd449028647f3b2dccc4f088696b..4203bd5fd0a110a4958685e09b26bb2060e7fcf2 100644 (file)
--- a/drivers/video/console/newport_con.c
+++ b/drivers/video/console/newport_con.c
@@ -496,7 +496,8 @@ static bool newport_blank(struct vc_data *c, enum vesa_blank_mode blank,
        return true;
 }
 
-static int newport_set_font(int unit, struct console_font *op, unsigned int vpitch)
+static int newport_set_font(int unit, const struct console_font *op,
+                           unsigned int vpitch)
 {
        int w = op->width;
        int h = op->height;
@@ -568,7 +569,7 @@ static int newport_font_default(struct vc_data *vc, struct console_font *op, cha
        return newport_set_def_font(vc->vc_num, op);
 }
 
-static int newport_font_set(struct vc_data *vc, struct console_font *font,
+static int newport_font_set(struct vc_data *vc, const struct console_font *font,
                            unsigned int vpitch, unsigned int flags)
 {
        return newport_set_font(vc->vc_num, font, vpitch);

diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index cbb9ef438214f68e10da17bc729b1a432bacf051..710201fb8ce4119257260de1a55387187bf978fe 100644 (file)
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -153,7 +153,7 @@ static void sticon_set_def_font(int unit)
        }
 }
 
-static int sticon_set_font(struct vc_data *vc, struct console_font *op,
+static int sticon_set_font(struct vc_data *vc, const struct console_font *op,
                           unsigned int vpitch)
 {
        struct sti_struct *sti = sticon_sti;
@@ -253,7 +253,7 @@ static int sticon_font_default(struct vc_data *vc, struct console_font *op, char
        return 0;
 }
 
-static int sticon_font_set(struct vc_data *vc, struct console_font *font,
+static int sticon_font_set(struct vc_data *vc, const struct console_font *font,
                           unsigned int vpitch, unsigned int flags)
 {
        return sticon_set_font(vc, font, vpitch);

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index c9a22118102f3d7093e682d754f4bf603c0886dc..4d1c8f5863afd5831771d7cef8713d710076cb84 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -1039,7 +1039,7 @@ static int vgacon_adjust_height(struct vc_data *vc, unsigned fontheight)
        return 0;
 }
 
-static int vgacon_font_set(struct vc_data *c, struct console_font *font,
+static int vgacon_font_set(struct vc_data *c, const struct console_font *font,
                           unsigned int vpitch, unsigned int flags)
 {
        unsigned charcount = font->charcount;

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index eee2adf5c682bc97e7710b7d440d923af296e90b..62474630c4d485d999bc29f3066223119be91099 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -2460,7 +2460,7 @@ err_out:
  *  but lets not assume that, since charcount of 512 is small for unicode support.
  */
 
-static int fbcon_set_font(struct vc_data *vc, struct console_font *font,
+static int fbcon_set_font(struct vc_data *vc, const struct console_font *font,
                          unsigned int vpitch, unsigned int flags)
 {
        struct fb_info *info = fbcon_info_from_console(vc->vc_num);

diff --git a/include/linux/console.h b/include/linux/console.h
index 6392bcd2fe7cb3c1c235c62d96f3b7e48aabb17e..0a9f4cbdde83fe1510974d171c61c1fc5b68593f 100644 (file)
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -75,8 +75,9 @@ struct consw {
        bool    (*con_switch)(struct vc_data *vc);
        bool    (*con_blank)(struct vc_data *vc, enum vesa_blank_mode blank,
                             bool mode_switch);
-       int     (*con_font_set)(struct vc_data *vc, struct console_font *font,
-                       unsigned int vpitch, unsigned int flags);
+       int     (*con_font_set)(struct vc_data *vc,
+                               const struct console_font *font,
+                               unsigned int vpitch, unsigned int flags);
        int     (*con_font_get)(struct vc_data *vc, struct console_font *font,
                        unsigned int vpitch);
        int     (*con_font_default)(struct vc_data *vc,