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

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.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77e11093

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -4625,7 +4625,7 @@ static int con_font_get(struct vc_data *vc, struct console_font_op *op) 
	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;

drivers/video/console/newport_con.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

drivers/video/console/sticon.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/video/console/vgacon.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/fbdev/core/fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

 */



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);