From 86c6c948dabff1ff84213e5fb50684ad32895f25 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 5 Feb 2013 22:32:30 +0100 Subject: [PATCH] staging/xgifb: Remove unused values in XG27_SR13 and XGI340_SR13 In the lookup tables XG27_SR13 and XGI340_SR13 only the first three values are used of each 'line', thus the remaining fields can be removed. Rationale: - vb_init.c uses pVBInfo->ram_type for the 'column' index for pVBInfo->SR15. - pVBInfo->ram_type is assigned the return value of XGINew_GetXG20DRAMType which can only be 0, 1 or 2 - pVBInfo->SR15 is assigned to either XG27_SR13 or XGI340_SR13 in vb_setmode.c -> only the first three values are used. This becomes also evident as values 3-7 are all 0. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/vb_struct.h | 2 +- drivers/staging/xgifb/vb_table.h | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 02f3bb5e09ce..ae0c18b320a4 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -157,7 +157,7 @@ struct vb_device_info { void __iomem *FBAddr; - unsigned char const (*SR15)[8]; + unsigned char const (*SR15)[3]; unsigned char const (*CR40)[3]; struct SiS_MCLKData const *MCLKData; diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index a1be75199e3d..b7abe25f3a4a 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -33,18 +33,18 @@ const struct XGI_ECLKDataStruct XGI340_ECLKData[] = { {0x5c, 0x23, 0x01, 166} }; -static const unsigned char XG27_SR13[4][8] = { - {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */ - {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */ - {0x32, 0x32, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */ - {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00} /* SR1B */ -}; - -static const unsigned char XGI340_SR13[4][8] = { - {0x35, 0x45, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR13 */ - {0x41, 0x51, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR14 */ - {0x31, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00}, /* SR18 */ - {0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00} /* SR1B */ +static const unsigned char XG27_SR13[4][3] = { + {0x35, 0x45, 0xb1}, /* SR13 */ + {0x41, 0x51, 0x5c}, /* SR14 */ + {0x32, 0x32, 0x42}, /* SR18 */ + {0x03, 0x03, 0x03} /* SR1B */ +}; + +static const unsigned char XGI340_SR13[4][3] = { + {0x35, 0x45, 0xb1}, /* SR13 */ + {0x41, 0x51, 0x5c}, /* SR14 */ + {0x31, 0x42, 0x42}, /* SR18 */ + {0x03, 0x03, 0x03} /* SR1B */ }; static const unsigned char XGI340_cr41[24][3] = { -- 2.39.5