summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeilin Ye <yepeilin.cs@gmail.com>2020-10-28 13:56:47 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-09 11:20:49 +0300
commit78e008dca2255bba0ffa890203049f6eb4bdbc28 (patch)
tree04680b115aa66fb9eb70f00bd3c5823adfa7e3f9 /include
parentc5b9b7fb123dbf560a4a19e26fab3d507825ee75 (diff)
downloadlinux-78e008dca2255bba0ffa890203049f6eb4bdbc28.tar.xz
Fonts: Make font size unsigned in font_desc
commit 7cb415003468d41aecd6877ae088c38f6c0fc174 upstream. `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> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20201028105647.1210161-1-yepeilin.cs@gmail.com Cc: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/font.h2
1 files changed, 1 insertions, 1 deletions
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;
};