From: Takashi Iwai <tiwai@suse.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH RFC 2/3] fonts: Use BUILD_BUG_ON() for checking empty font table
Date: Tue, 18 Jun 2019 22:34:24 +0200 [thread overview]
Message-ID: <20190618203425.10723-3-tiwai@suse.de> (raw)
In-Reply-To: <20190618203425.10723-1-tiwai@suse.de>
We have a nice macro, and the check of emptiness of the font table can
be done in a simpler way.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
lib/fonts/fonts.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c
index 269a829fcbb7..a8e31e9d6fc5 100644
--- a/lib/fonts/fonts.c
+++ b/lib/fonts/fonts.c
@@ -20,55 +20,41 @@
#endif
#include <linux/font.h>
-#define NO_FONTS
-
static const struct font_desc *fonts[] = {
#ifdef CONFIG_FONT_8x8
-#undef NO_FONTS
&font_vga_8x8,
#endif
#ifdef CONFIG_FONT_8x16
-#undef NO_FONTS
&font_vga_8x16,
#endif
#ifdef CONFIG_FONT_6x11
-#undef NO_FONTS
&font_vga_6x11,
#endif
#ifdef CONFIG_FONT_7x14
-#undef NO_FONTS
&font_7x14,
#endif
#ifdef CONFIG_FONT_SUN8x16
-#undef NO_FONTS
&font_sun_8x16,
#endif
#ifdef CONFIG_FONT_SUN12x22
-#undef NO_FONTS
&font_sun_12x22,
#endif
#ifdef CONFIG_FONT_10x18
-#undef NO_FONTS
&font_10x18,
#endif
#ifdef CONFIG_FONT_ACORN_8x8
-#undef NO_FONTS
&font_acorn_8x8,
#endif
#ifdef CONFIG_FONT_PEARL_8x8
-#undef NO_FONTS
&font_pearl_8x8,
#endif
#ifdef CONFIG_FONT_MINI_4x6
-#undef NO_FONTS
&font_mini_4x6,
#endif
#ifdef CONFIG_FONT_6x10
-#undef NO_FONTS
&font_6x10,
#endif
#ifdef CONFIG_FONT_TER16x32
-#undef NO_FONTS
&font_ter_16x32,
#endif
};
@@ -94,6 +80,7 @@ const struct font_desc *find_font(const char *name)
{
unsigned int i;
+ BUILD_BUG_ON(!num_fonts);
for (i = 0; i < num_fonts; i++)
if (!strcmp(fonts[i]->name, name))
return fonts[i];
--
2.16.4
next prev parent reply other threads:[~2019-06-18 20:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 20:34 [PATCH RFC 0/3] Automatically choose a bigger font for high resolution screens Takashi Iwai
2019-06-18 20:34 ` [PATCH RFC 1/3] fonts: Fix coding style Takashi Iwai
2019-06-18 20:34 ` Takashi Iwai [this message]
2019-06-18 23:05 ` [PATCH RFC 2/3] fonts: Use BUILD_BUG_ON() for checking empty font table Randy Dunlap
2019-06-19 5:36 ` Takashi Iwai
2019-06-18 20:34 ` [PATCH RFC 3/3] fonts: Prefer a bigger font for high resolution screens Takashi Iwai
2019-06-20 6:28 ` [PATCH RFC 0/3] Automatically choose " Greg Kroah-Hartman
2019-06-20 7:43 ` Takashi Iwai
2019-06-20 8:12 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190618203425.10723-3-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®