x86, setup: remove obsolete pre-Kconfig CONFIG_VIDEO_ variables

There were a set of pre-Kconfig configuration variables defined in the
video code.  There is absolutely no evidence that they have been
tweaked by anybody in modern history, so just get rid of them and hope
nobody notices.  If someone does complain, these should be made real
Kconfig variables.

Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
index c700147d6ffb24b72fbbf43ff954d4cfd268f137..d7ef26ba4540902d5d4f5ca87f203803abdd6cf2 100644 (file)
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
@@ -31,7 +31,6 @@ static inline void vesa_store_mode_params_graphics(void) {}
 
 static int vesa_probe(void)
 {
-#if defined(CONFIG_VIDEO_VESA) || defined(CONFIG_FIRMWARE_EDID)
        struct biosregs ireg, oreg;
        u16 mode;
        addr_t mode_ptr;
@@ -49,8 +48,7 @@ static int vesa_probe(void)
            vginfo.signature != VESA_MAGIC ||
            vginfo.version < 0x0102)
                return 0;       /* Not present */
-#endif /* CONFIG_VIDEO_VESA || CONFIG_FIRMWARE_EDID */
-#ifdef CONFIG_VIDEO_VESA
+
        set_fs(vginfo.video_mode_ptr.seg);
        mode_ptr = vginfo.video_mode_ptr.off;
 
@@ -102,9 +100,6 @@ static int vesa_probe(void)
        }
 
        return nmodes;
-#else
-       return 0;
-#endif /* CONFIG_VIDEO_VESA */
 }
 
 static int vesa_set_mode(struct mode_info *mode)

diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index 8f8d827e254d0b8cb392bf7fe95103059ac5ca89..819caa1f200879887c3726de406cbf664a771960 100644 (file)
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -47,14 +47,6 @@ static u8 vga_set_basic_mode(void)
 
        initregs(&ireg);
 
-#ifdef CONFIG_VIDEO_400_HACK
-       if (adapter >= ADAPTER_VGA) {
-               ireg.ax = 0x1202;
-               ireg.bx = 0x0030;
-               intcall(0x10, &ireg, NULL);
-       }
-#endif
-
        ax = 0x0f00;
        intcall(0x10, &ireg, &oreg);
        mode = oreg.al;
@@ -62,11 +54,9 @@ static u8 vga_set_basic_mode(void)
        set_fs(0);
        rows = rdfs8(0x484);    /* rows minus one */
 
-#ifndef CONFIG_VIDEO_400_HACK
        if ((oreg.ax == 0x5003 || oreg.ax == 0x5007) &&
            (rows == 0 || rows == 24))
                return mode;
-#endif
 
        if (mode != 3 && mode != 7)
                mode = 3;

diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index bad728b76fc2acff40b1e5052ae20b0e08ea5dc1..d42da380249940ced8d6cdbb13bf76467ea89792 100644 (file)
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -221,7 +221,6 @@ static unsigned int mode_menu(void)
        }
 }
 
-#ifdef CONFIG_VIDEO_RETAIN
 /* Save screen content to the heap */
 static struct saved_screen {
        int x, y;
@@ -299,10 +298,6 @@ static void restore_screen(void)
        ireg.dl = saved.curx;
        intcall(0x10, &ireg, NULL);
 }
-#else
-#define save_screen()          ((void)0)
-#define restore_screen()       ((void)0)
-#endif
 
 void set_video(void)
 {

diff --git a/arch/x86/boot/video.h b/arch/x86/boot/video.h
index 5bb174a997fc61a3609a0a41500192f4475e676a..ff339c5db31127c7db4e27d9e16c32d1d3d0753d 100644 (file)
--- a/arch/x86/boot/video.h
+++ b/arch/x86/boot/video.h
@@ -17,19 +17,8 @@
 
 #include <linux/types.h>
 
-/* Enable autodetection of SVGA adapters and modes. */
-#undef CONFIG_VIDEO_SVGA
-
-/* Enable autodetection of VESA modes */
-#define CONFIG_VIDEO_VESA
-
-/* Retain screen contents when switching modes */
-#define CONFIG_VIDEO_RETAIN
-
-/* Force 400 scan lines for standard modes (hack to fix bad BIOS behaviour */
-#undef CONFIG_VIDEO_400_HACK
-
-/* This code uses an extended set of video mode numbers. These include:
+/*
+ * This code uses an extended set of video mode numbers. These include:
  * Aliases for standard modes
  *      NORMAL_VGA (-1)
  *      EXTENDED_VGA (-2)
@@ -67,13 +56,8 @@
 /* The "recalculate timings" flag */
 #define VIDEO_RECALC 0x8000
 
-/* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
-#ifdef CONFIG_VIDEO_RETAIN
 void store_screen(void);
 #define DO_STORE() store_screen()
-#else
-#define DO_STORE() ((void)0)
-#endif /* CONFIG_VIDEO_RETAIN */
 
 /*
  * Mode table structures