[MIPS] Malta: set up the screen info in a separate function

This patch adds a separate short and sweet function to initialize
the screen_info global variable.

This improves readability of the Malta board setup code.

No functional changes introduced.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 79d74ea75bc41e60f05ac1040af0cd5fd67a0bad..8b391ee034af0c7c4605522c52a8272738101328 100644 (file)
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -132,6 +132,26 @@ static void __init pci_clock_check(void)
 }
 #endif
 
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+static void __init screen_info_setup(void)
+{
+       screen_info = (struct screen_info) {
+               .orig_x = 0,
+               .orig_y = 25,
+               .ext_mem_k = 0,
+               .orig_video_page = 0,
+               .orig_video_mode = 0,
+               .orig_video_cols = 80,
+               .unused2 = 0,
+               .orig_video_ega_bx = 0,
+               .unused3 = 0,
+               .orig_video_lines = 25,
+               .orig_video_isVGA = VIDEO_TYPE_VGAC,
+               .orig_video_points = 16
+       };
+}
+#endif
+
 void __init plat_mem_setup(void)
 {
        unsigned int i;
@@ -200,23 +220,8 @@ void __init plat_mem_setup(void)
 #ifdef CONFIG_BLK_DEV_FD
        fd_activate();
 #endif
-#ifdef CONFIG_VT
-#if defined(CONFIG_VGA_CONSOLE)
-       screen_info = (struct screen_info) {
-               .orig_x = 0,
-               .orig_y = 25,
-               .ext_mem_k = 0,
-               .orig_video_page = 0,
-               .orig_video_mode = 0,
-               .orig_video_cols = 80,
-               .unused2 = 0,
-               .orig_video_ega_bx = 0,
-               .unused3 = 0,
-               .orig_video_lines = 25,
-               .orig_video_isVGA = VIDEO_TYPE_VGAC,
-               .orig_video_points = 16
-       };
-#endif
+#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
+       screen_info_setup();
 #endif
        mips_reboot_setup();
 }