fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
authorPeilin Ye <yepeilin.cs@gmail.com>
Thu, 24 Sep 2020 13:40:53 +0000 (09:40 -0400)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 25 Sep 2020 08:28:18 +0000 (10:28 +0200)
commitbb0890b4cd7f8203e3aa99c6d0f062d6acdaad27
tree9f769a1e4121c4592a37e896c7a4e7fdbf1d5395
parent19a508bd1ad8e444de86873bf2f2b2ab8edd6552
fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h

drivers/video/console/newport_con.c is borrowing FONT_EXTRA_WORDS macros
from drivers/video/fbdev/core/fbcon.h. To keep things simple, move all
definitions into <linux/font.h>.

Since newport_con now uses four extra words, initialize the fourth word in
newport_set_font() properly.

Cc: stable@vger.kernel.org
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/7fb8bc9b0abc676ada6b7ac0e0bd443499357267.1600953813.git.yepeilin.cs@gmail.com
drivers/video/console/newport_con.c
drivers/video/fbdev/core/fbcon.h
drivers/video/fbdev/core/fbcon_rotate.c
drivers/video/fbdev/core/tileblit.c
include/linux/font.h