Commit fd0f631f authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman

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: default avatar"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.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77e11093
...@@ -4625,7 +4625,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op) ...@@ -4625,7 +4625,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op)
return rc; 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; struct console_font font;
int rc = -EINVAL; int rc = -EINVAL;
......
...@@ -496,7 +496,8 @@ static bool newport_blank(struct vc_data *c, enum vesa_blank_mode blank, ...@@ -496,7 +496,8 @@ static bool newport_blank(struct vc_data *c, enum vesa_blank_mode blank,
return true; 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 w = op->width;
int h = op->height; int h = op->height;
...@@ -568,7 +569,7 @@ static int newport_font_default(struct vc_data *vc, struct console_font *op, cha ...@@ -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); 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) unsigned int vpitch, unsigned int flags)
{ {
return newport_set_font(vc->vc_num, font, vpitch); return newport_set_font(vc->vc_num, font, vpitch);
......
...@@ -153,7 +153,7 @@ static void sticon_set_def_font(int unit) ...@@ -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) unsigned int vpitch)
{ {
struct sti_struct *sti = sticon_sti; struct sti_struct *sti = sticon_sti;
...@@ -253,7 +253,7 @@ static int sticon_font_default(struct vc_data *vc, struct console_font *op, char ...@@ -253,7 +253,7 @@ static int sticon_font_default(struct vc_data *vc, struct console_font *op, char
return 0; 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) unsigned int vpitch, unsigned int flags)
{ {
return sticon_set_font(vc, font, vpitch); return sticon_set_font(vc, font, vpitch);
......
...@@ -1039,7 +1039,7 @@ static int vgacon_adjust_height(struct vc_data *vc, unsigned fontheight) ...@@ -1039,7 +1039,7 @@ static int vgacon_adjust_height(struct vc_data *vc, unsigned fontheight)
return 0; 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 int vpitch, unsigned int flags)
{ {
unsigned charcount = font->charcount; unsigned charcount = font->charcount;
......
...@@ -2460,7 +2460,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, ...@@ -2460,7 +2460,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount,
* but lets not assume that, since charcount of 512 is small for unicode support. * 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) unsigned int vpitch, unsigned int flags)
{ {
struct fb_info *info = fbcon_info_from_console(vc->vc_num); struct fb_info *info = fbcon_info_from_console(vc->vc_num);
......
...@@ -75,8 +75,9 @@ struct consw { ...@@ -75,8 +75,9 @@ struct consw {
bool (*con_switch)(struct vc_data *vc); bool (*con_switch)(struct vc_data *vc);
bool (*con_blank)(struct vc_data *vc, enum vesa_blank_mode blank, bool (*con_blank)(struct vc_data *vc, enum vesa_blank_mode blank,
bool mode_switch); bool mode_switch);
int (*con_font_set)(struct vc_data *vc, struct console_font *font, int (*con_font_set)(struct vc_data *vc,
unsigned int vpitch, unsigned int flags); const struct console_font *font,
unsigned int vpitch, unsigned int flags);
int (*con_font_get)(struct vc_data *vc, struct console_font *font, int (*con_font_get)(struct vc_data *vc, struct console_font *font,
unsigned int vpitch); unsigned int vpitch);
int (*con_font_default)(struct vc_data *vc, int (*con_font_default)(struct vc_data *vc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment