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

tty: vt: make consw::con_font_default()'s name const 



It's a name after all and that is not supposed to be changed. So make it
const to make this obvious.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
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-38-jirislaby@kernel.org


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

drivers/video/console/newport_con.c

+2 −1
Original line number Diff line number Diff line
@@ -564,7 +564,8 @@ static int newport_set_def_font(int unit, struct console_font *op) 
	return 0;

}



static int newport_font_default(struct vc_data *vc, struct console_font *op, char *name)

static int newport_font_default(struct vc_data *vc, struct console_font *op,

				const char *name)

{

	return newport_set_def_font(vc->vc_num, op);

}

drivers/video/console/sticon.c

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ static int sticon_set_font(struct vc_data *vc, const struct console_font *op, 
	return 0;

}



static int sticon_font_default(struct vc_data *vc, struct console_font *op, char *name)

static int sticon_font_default(struct vc_data *vc, struct console_font *op,

			       const char *name)

{

	sticon_set_def_font(vc->vc_num);

drivers/video/fbdev/core/fbcon.c

+2 −1
Original line number Diff line number Diff line
@@ -2533,7 +2533,8 @@ static int fbcon_set_font(struct vc_data *vc, const struct console_font *font, 
	return fbcon_do_set_font(vc, font->width, font->height, charcount, new_data, 1);

}



static int fbcon_set_def_font(struct vc_data *vc, struct console_font *font, char *name)

static int fbcon_set_def_font(struct vc_data *vc, struct console_font *font,

			      const char *name)

{

	struct fb_info *info = fbcon_info_from_console(vc->vc_num);

	const struct font_desc *f;

include/linux/console.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct consw { 
	int	(*con_font_get)(struct vc_data *vc, struct console_font *font,

			unsigned int vpitch);

	int	(*con_font_default)(struct vc_data *vc,

			struct console_font *font, char *name);

			struct console_font *font, const char *name);

	int     (*con_resize)(struct vc_data *vc, unsigned int width,

			      unsigned int height, bool from_user);

	void	(*con_set_palette)(struct vc_data *vc,