fonts: Fix coding style

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>

diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c
index 9969358a7af5a84aff788cc49fe103437286c5f6..269a829fcbb7091f7be1b0933c8bfddf57fd1ef3 100644 (file)
--- a/lib/fonts/fonts.c
+++ b/lib/fonts/fonts.c
@@ -25,51 +25,51 @@
 static const struct font_desc *fonts[] = {
 #ifdef CONFIG_FONT_8x8
 #undef NO_FONTS
-    &font_vga_8x8,
+       &font_vga_8x8,
 #endif
 #ifdef CONFIG_FONT_8x16
 #undef NO_FONTS
-    &font_vga_8x16,
+       &font_vga_8x16,
 #endif
 #ifdef CONFIG_FONT_6x11
 #undef NO_FONTS
-    &font_vga_6x11,
+       &font_vga_6x11,
 #endif
 #ifdef CONFIG_FONT_7x14
 #undef NO_FONTS
-    &font_7x14,
+       &font_7x14,
 #endif
 #ifdef CONFIG_FONT_SUN8x16
 #undef NO_FONTS
-    &font_sun_8x16,
+       &font_sun_8x16,
 #endif
 #ifdef CONFIG_FONT_SUN12x22
 #undef NO_FONTS
-    &font_sun_12x22,
+       &font_sun_12x22,
 #endif
 #ifdef CONFIG_FONT_10x18
 #undef NO_FONTS
-    &font_10x18,
+       &font_10x18,
 #endif
 #ifdef CONFIG_FONT_ACORN_8x8
 #undef NO_FONTS
-    &font_acorn_8x8,
+       &font_acorn_8x8,
 #endif
 #ifdef CONFIG_FONT_PEARL_8x8
 #undef NO_FONTS
-    &font_pearl_8x8,
+       &font_pearl_8x8,
 #endif
 #ifdef CONFIG_FONT_MINI_4x6
 #undef NO_FONTS
-    &font_mini_4x6,
+       &font_mini_4x6,
 #endif
 #ifdef CONFIG_FONT_6x10
 #undef NO_FONTS
-    &font_6x10,
+       &font_6x10,
 #endif
 #ifdef CONFIG_FONT_TER16x32
 #undef NO_FONTS
-    &font_ter_16x32,
+       &font_ter_16x32,
 #endif
 };
 
@@ -90,16 +90,16 @@ static const struct font_desc *fonts[] = {
  *     specified font.
  *
  */
-
 const struct font_desc *find_font(const char *name)
 {
-   unsigned int i;
+       unsigned int i;
 
-   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);
 
 
 /**
@@ -116,44 +116,41 @@ const struct font_desc *find_font(const char *name)
  *     chosen font.
  *
  */
-
 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 (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
-           c = 100;
+               if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
+                       c = 100;
 #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;
 #endif
 #endif
-       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;
+               }
        }
-    }
-    return g;
+       return g;
 }
-
-EXPORT_SYMBOL(find_font);
 EXPORT_SYMBOL(get_default_font);
 
 MODULE_AUTHOR("James Simmons <jsimmons@users.sf.net>");