diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-06-18 22:34:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-20 08:22:47 +0200 |
| commit | 73a649d2b98e25f4960b8081080c78695fea8bc7 (patch) | |
| tree | aae18222da1de6dc2a20771407515d1f93ac639f | |
| parent | aa1d19f1f96764e72155235ece22461599d0e7ac (diff) | |
fonts: Use BUILD_BUG_ON() for checking empty font table
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>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | lib/fonts/fonts.c | 15 |
1 files changed, 1 insertions, 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]; |