Commit 7cb41500 authored by Peilin Ye's avatar Peilin Ye Committed by Daniel Vetter
Browse files

Fonts: Make font size unsigned in font_desc 



`width` and `height` are defined as unsigned in our UAPI font descriptor
`struct console_font`. Make them unsigned in our kernel font descriptor
`struct font_desc`, too.

Also, change the corresponding printk() format identifiers from `%d` to
`%u`, in sti_select_fbfont().

Signed-off-by: default avatarPeilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028105647.1210161-1-yepeilin.cs@gmail.com
parent e0006503

drivers/video/console/sticore.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 
	if (!fbfont)

		return NULL;



	pr_info("STI selected %dx%d framebuffer font %s for sticon\n",

	pr_info("STI selected %ux%u framebuffer font %s for sticon\n",

			fbfont->width, fbfont->height, fbfont->name);

			

	bpc = ((fbfont->width+7)/8) * fbfont->height;

include/linux/font.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
struct font_desc {

    int idx;

    const char *name;

    int width, height;

    unsigned int width, height;

    const void *data;

    int pref;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE