staging: xgifb: drop redudant mode table entries

Since the mode search is not string-based anymore, we can drop XxYx24
entries which were just duplicated XxYx32 entries.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index ae778a1..fef9adf 100644 (file)
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -105,17 +105,12 @@ static const struct _XGIbios_mode {
         MD_XGI300|MD_XGI315},
        {"640x480x16",   0x44, 0x0111, 0x0111,  640,  480, 16,  80, 30,
         MD_XGI300|MD_XGI315},
-       {"640x480x24",   0x62, 0x013a, 0x0112,  640,  480, 32,  80, 30,
-        MD_XGI300|MD_XGI315},  /* TW: That's for people who mix up color-
-                                       and fb depth */
        {"640x480x32",   0x62, 0x013a, 0x0112,  640,  480, 32,  80, 30,
         MD_XGI300|MD_XGI315},
        {"720x480x8",    0x31, 0x0000, 0x0000,  720,  480,  8,  90, 30,
         MD_XGI300|MD_XGI315},
        {"720x480x16",   0x33, 0x0000, 0x0000,  720,  480, 16,  90, 30,
         MD_XGI300|MD_XGI315},
-       {"720x480x24",   0x35, 0x0000, 0x0000,  720,  480, 32,  90, 30,
-        MD_XGI300|MD_XGI315},
        {"720x480x32",   0x35, 0x0000, 0x0000,  720,  480, 32,  90, 30,
         MD_XGI300|MD_XGI315},
        {"720x576x8",    0x32, 0x0000, 0x0000,  720,  576,  8,  90, 36,
@@ -130,17 +125,13 @@ static const struct _XGIbios_mode {
         MD_XGI300|MD_XGI315},
        {"800x480x16",   0x7a, 0x0000, 0x0000,  800,  480, 16, 100, 30,
         MD_XGI300|MD_XGI315},
-       {"800x480x24",   0x76, 0x0000, 0x0000,  800,  480, 32, 100, 30,
-        MD_XGI300|MD_XGI315},
        {"800x480x32",   0x76, 0x0000, 0x0000,  800,  480, 32, 100, 30,
         MD_XGI300|MD_XGI315},
        {"800x600x8",    0x30, 0x0103, 0x0103,  800,  600,  8, 100, 37,
         MD_XGI300|MD_XGI315},
-#define DEFAULT_MODE              20 /* index for 800x600x16 */
+#define DEFAULT_MODE              17 /* index for 800x600x16 */
        {"800x600x16",   0x47, 0x0114, 0x0114,  800,  600, 16, 100, 37,
         MD_XGI300|MD_XGI315},
-       {"800x600x24",   0x63, 0x013b, 0x0115,  800,  600, 32, 100, 37,
-        MD_XGI300|MD_XGI315},
        {"800x600x32",   0x63, 0x013b, 0x0115,  800,  600, 32, 100, 37,
         MD_XGI300|MD_XGI315},
        {"1024x576x8",   0x71, 0x0000, 0x0000, 1024,  576,  8, 128, 36,
@@ -155,8 +146,6 @@ static const struct _XGIbios_mode {
         MD_XGI300          },  /* TW: 300 series only */
        {"1024x600x16",  0x21, 0x0000, 0x0000, 1024,  600, 16, 128, 37,
         MD_XGI300          },
-       {"1024x600x24",  0x22, 0x0000, 0x0000, 1024,  600, 32, 128, 37,
-        MD_XGI300          },
        {"1024x600x32",  0x22, 0x0000, 0x0000, 1024,  600, 32, 128, 37,
         MD_XGI300          },
        {"1024x768x8",   0x38, 0x0105, 0x0105, 1024,  768,  8, 128, 48,
@@ -171,72 +160,54 @@ static const struct _XGIbios_mode {
         MD_XGI300          },  /* TW: 300 series only */
        {"1152x768x16",  0x24, 0x0000, 0x0000, 1152,  768, 16, 144, 48,
         MD_XGI300          },
-       {"1152x768x24",  0x25, 0x0000, 0x0000, 1152,  768, 32, 144, 48,
-        MD_XGI300          },
        {"1152x768x32",  0x25, 0x0000, 0x0000, 1152,  768, 32, 144, 48,
         MD_XGI300          },
        {"1280x720x8",   0x79, 0x0000, 0x0000, 1280,  720,  8, 160, 45,
         MD_XGI300|MD_XGI315},
        {"1280x720x16",  0x75, 0x0000, 0x0000, 1280,  720, 16, 160, 45,
         MD_XGI300|MD_XGI315},
-       {"1280x720x24",  0x78, 0x0000, 0x0000, 1280,  720, 32, 160, 45,
-        MD_XGI300|MD_XGI315},
        {"1280x720x32",  0x78, 0x0000, 0x0000, 1280,  720, 32, 160, 45,
         MD_XGI300|MD_XGI315},
        {"1280x768x8",   0x23, 0x0000, 0x0000, 1280,  768,  8, 160, 48,
         MD_XGI315},  /* TW: 310/325 series only */
        {"1280x768x16",  0x24, 0x0000, 0x0000, 1280,  768, 16, 160, 48,
         MD_XGI315},
-       {"1280x768x24",  0x25, 0x0000, 0x0000, 1280,  768, 32, 160, 48,
-        MD_XGI315},
        {"1280x768x32",  0x25, 0x0000, 0x0000, 1280,  768, 32, 160, 48,
         MD_XGI315},
        {"1280x960x8",   0x7C, 0x0000, 0x0000, 1280,  960,  8, 160, 60,
         MD_XGI300|MD_XGI315},
        {"1280x960x16",  0x7D, 0x0000, 0x0000, 1280,  960, 16, 160, 60,
         MD_XGI300|MD_XGI315},
-       {"1280x960x24",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 160, 60,
-        MD_XGI300|MD_XGI315},
        {"1280x960x32",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 160, 60,
         MD_XGI300|MD_XGI315},
        {"1280x1024x8",  0x3A, 0x0107, 0x0107, 1280, 1024,  8, 160, 64,
         MD_XGI300|MD_XGI315},
        {"1280x1024x16", 0x4D, 0x011a, 0x011a, 1280, 1024, 16, 160, 64,
         MD_XGI300|MD_XGI315},
-       {"1280x1024x24", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 160, 64,
-        MD_XGI300|MD_XGI315},
        {"1280x1024x32", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 160, 64,
         MD_XGI300|MD_XGI315},
        {"1400x1050x8",  0x26, 0x0000, 0x0000, 1400, 1050,  8, 175, 65,
         MD_XGI315},  /* TW: 310/325 series only */
        {"1400x1050x16", 0x27, 0x0000, 0x0000, 1400, 1050, 16, 175, 65,
         MD_XGI315},
-       {"1400x1050x24", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 175, 65,
-        MD_XGI315},
        {"1400x1050x32", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 175, 65,
         MD_XGI315},
        {"1600x1200x8",  0x3C, 0x0130, 0x011c, 1600, 1200,  8, 200, 75,
         MD_XGI300|MD_XGI315},
        {"1600x1200x16", 0x3D, 0x0131, 0x011e, 1600, 1200, 16, 200, 75,
         MD_XGI300|MD_XGI315},
-       {"1600x1200x24", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 200, 75,
-        MD_XGI300|MD_XGI315},
        {"1600x1200x32", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 200, 75,
         MD_XGI300|MD_XGI315},
        {"1920x1440x8",  0x68, 0x013f, 0x0000, 1920, 1440,  8, 240, 75,
         MD_XGI300|MD_XGI315},
        {"1920x1440x16", 0x69, 0x0140, 0x0000, 1920, 1440, 16, 240, 75,
         MD_XGI300|MD_XGI315},
-       {"1920x1440x24", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 240, 75,
-        MD_XGI300|MD_XGI315},
        {"1920x1440x32", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 240, 75,
         MD_XGI300|MD_XGI315},
        {"2048x1536x8",  0x6c, 0x0000, 0x0000, 2048, 1536,  8, 256, 96,
         MD_XGI315},  /* TW: 310/325 series only */
        {"2048x1536x16", 0x6d, 0x0000, 0x0000, 2048, 1536, 16, 256, 96,
         MD_XGI315},
-       {"2048x1536x24", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 256, 96,
-        MD_XGI315},
        {"2048x1536x32", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 256, 96,
         MD_XGI315},
        {"\0", 0x00, 0, 0, 0, 0, 0, 0}