From: Simon Glass <sjg@chromium.org>
Date: Thu, 6 Oct 2022 14:36:10 +0000 (-0600)
Subject: video: Tidy up the check for valid fonts
X-Git-Tag: v2025.01-rc5-pxa1908~1229^2~49
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=5330612f219bcd98f99b977a1fdec51c6b265ad2;p=u-boot.git

video: Tidy up the check for valid fonts

Put this check into a function so we can use it elsewhere. Also drop the
macros which do the same thing but are not actually used.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index c04b449a6d..1331ce8d89 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -526,9 +526,18 @@ static struct font_info font_table[] = {
 	{} /* sentinel */
 };
 
-#define FONT_BEGIN(name)	__ttf_ ## name ## _begin
-#define FONT_END(name)		__ttf_ ## name ## _end
-#define FONT_IS_VALID(name)	(abs(FONT_END(name) - FONT_BEGIN) > 4)
+/**
+ * font_valid() - Check if a font-table entry is valid
+ *
+ * Depending on available files in the build system, fonts may end up being
+ * empty.
+ *
+ * @return true if the entry is valid
+ */
+static inline bool font_valid(struct font_info *tab)
+{
+	return abs(tab->begin - tab->end) > 4;
+}
 
 /**
  * console_truetype_find_font() - Find a suitable font
@@ -542,7 +551,7 @@ static u8 *console_truetype_find_font(void)
 	struct font_info *tab;
 
 	for (tab = font_table; tab->begin; tab++) {
-		if (abs(tab->begin - tab->end) > 4) {
+		if (font_valid(tab)) {
 			debug("%s: Font '%s', at %p, size %lx\n", __func__,
 			      tab->name, tab->begin,
 			      (ulong)(tab->end - tab->begin));