On Wed, Oct 28, 2020 at 06:56:47AM -0400, Peilin Ye wrote:
`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: Peilin Ye yepeilin.cs@gmail.com
Pushed to drm-misc-next, thanks for the patch. -Daniel
Change in v2:
- Mention `struct console_font` in the commit message. (Suggested by Daniel Vetter daniel@ffwll.ch)
drivers/video/console/sticore.c | 2 +- include/linux/font.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 6a26a364f9bd..d1bb5915082b 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -502,7 +502,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;
diff --git a/include/linux/font.h b/include/linux/font.h index b5b312c19e46..4f50d736ea72 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -16,7 +16,7 @@ struct font_desc { int idx; const char *name;
- int width, height;
- unsigned int width, height; const void *data; int pref;
};
2.25.1