lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 015/452] Fonts: Make font size unsigned in font_desc
    Date
    From: Peilin Ye <yepeilin.cs@gmail.com>

    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>
    ---
    drivers/video/console/sticore.c | 2 +-
    include/linux/font.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/video/console/sticore.c
    +++ b/drivers/video/console/sticore.c
    @@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom
    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;
    --- 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;
    };

    \
     
     \ /
      Last update: 2022-06-07 19:20    [W:2.695 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site