BugLink: https://bugs.launchpad.net/bugs/1851623
Fix indentation, spaces, and move EXPORT_SYMBOL line to the
appropriate place as a preliminary work. No actual code change.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit
aa1d19f1f96764e72155235ece22461599d0e7ac)
Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
static const struct font_desc *fonts[] = {
#ifdef CONFIG_FONT_8x8
#undef NO_FONTS
static const struct font_desc *fonts[] = {
#ifdef CONFIG_FONT_8x8
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_8x16
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_8x16
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_6x11
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_6x11
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_7x14
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_7x14
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_SUN8x16
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_SUN8x16
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_SUN12x22
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_SUN12x22
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_10x18
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_10x18
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_ACORN_8x8
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_ACORN_8x8
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_PEARL_8x8
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_PEARL_8x8
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_MINI_4x6
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_MINI_4x6
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_6x10
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_6x10
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_TER16x32
#undef NO_FONTS
#endif
#ifdef CONFIG_FONT_TER16x32
#undef NO_FONTS
const struct font_desc *find_font(const char *name)
{
const struct font_desc *find_font(const char *name)
{
- for (i = 0; i < num_fonts; i++)
- if (!strcmp(fonts[i]->name, name))
- return fonts[i];
- return NULL;
+ for (i = 0; i < num_fonts; i++)
+ if (!strcmp(fonts[i]->name, name))
+ return fonts[i];
+ return NULL;
+EXPORT_SYMBOL(find_font);
const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
u32 font_h)
{
const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
u32 font_h)
{
- int i, c, cc;
- const struct font_desc *f, *g;
-
- g = NULL;
- cc = -10000;
- for(i=0; i<num_fonts; i++) {
- f = fonts[i];
- c = f->pref;
+ int i, c, cc;
+ const struct font_desc *f, *g;
+
+ g = NULL;
+ cc = -10000;
+ for (i = 0; i < num_fonts; i++) {
+ f = fonts[i];
+ c = f->pref;
#if defined(__mc68000__)
#ifdef CONFIG_FONT_PEARL_8x8
#if defined(__mc68000__)
#ifdef CONFIG_FONT_PEARL_8x8
- if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
- c = 100;
+ if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
+ c = 100;
#endif
#ifdef CONFIG_FONT_6x11
#endif
#ifdef CONFIG_FONT_6x11
- if (MACH_IS_MAC && xres < 640 && f->idx == VGA6x11_IDX)
- c = 100;
+ if (MACH_IS_MAC && xres < 640 && f->idx == VGA6x11_IDX)
+ c = 100;
- if ((yres < 400) == (f->height <= 8))
- c += 1000;
+ if ((yres < 400) == (f->height <= 8))
+ c += 1000;
- if ((font_w & (1 << (f->width - 1))) &&
- (font_h & (1 << (f->height - 1))))
- c += 1000;
+ if ((font_w & (1 << (f->width - 1))) &&
+ (font_h & (1 << (f->height - 1))))
+ c += 1000;
- if (c > cc) {
- cc = c;
- g = f;
+ if (c > cc) {
+ cc = c;
+ g = f;
+ }
-
-EXPORT_SYMBOL(find_font);
EXPORT_SYMBOL(get_default_font);
MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");
EXPORT_SYMBOL(get_default_font);
MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");