From 3825b38e593c9c078f7b8aebca636b2219783ad5 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 31 Aug 2011 21:46:04 +0300 Subject: [PATCH] staging: xgifb: do not initialize static data to 0 Remove redundant initializations. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/vb_table.h | 94 +++++++------------------------- 1 file changed, 20 insertions(+), 74 deletions(-) diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 770f859a6a99..870e0f440908 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -107,62 +107,12 @@ static unsigned char XGI340_CR6B[8][4] = { {0x00, 0x00, 0x00, 0x00} }; -static unsigned char XGI340_CR6E[8][4] = { - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00} -}; +static unsigned char XGI340_CR6E[8][4]; + +static unsigned char XGI340_CR6F[8][32]; + +static unsigned char XGI340_CR89[8][2]; -static unsigned char XGI340_CR6F[8][32] = { - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} -}; - -static unsigned char XGI340_CR89[8][2] = { - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00}, - {0x00, 0x00} -}; /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */ static unsigned char XGI340_AGPReg[12] = { 0x28, 0x23, 0x00, 0x20, 0x00, 0x20, @@ -171,10 +121,10 @@ static unsigned char XGI340_AGPReg[12] = { static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83}; -static unsigned char XGI330_sr25[] = {0x00, 0x0}; +static unsigned char XGI330_sr25[2]; static unsigned char XGI330_sr31 = 0xc0; static unsigned char XGI330_sr32 = 0x11; -static unsigned char XGI330_SR33 = 0x00; +static unsigned char XGI330_SR33; static unsigned char XG40_CRCF = 0x13; static unsigned char XG40_DRAMTypeDefinition = 0xFF ; @@ -783,13 +733,9 @@ static struct XGI_StandTableStruct XGI330_StandTable[] = { } }; -static struct XGI_TimingHStruct XGI_TimingH[] = { - { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} } -}; +static struct XGI_TimingHStruct XGI_TimingH[1]; -static struct XGI_TimingVStruct XGI_TimingV[] = { - { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} } -}; +static struct XGI_TimingVStruct XGI_TimingV[1]; static struct XGI_XG21CRT1Struct XGI_UpdateCRT1Table[] = { {0x01, 0x27, 0x91, 0x8f, 0xc0}, /* 00 */ @@ -2955,15 +2901,15 @@ static unsigned char XGI330_SoftSetting = 0x30; static unsigned char XGI330_SR07 = 0x18; static unsigned char XGI330_CR49[] = {0xaa, 0x88}; -static unsigned char XGI330_SR1F = 0x0; +static unsigned char XGI330_SR1F; static unsigned char XGI330_SR21 = 0xa3; static unsigned char XGI330_SR22 = 0xfb; static unsigned char XGI330_SR23 = 0xf6; static unsigned char XGI330_SR24 = 0xd; -static unsigned char XGI330_CRT2Data_1_2 = 0x0; -static unsigned char XGI330_CRT2Data_4_D = 0x0; -static unsigned char XGI330_CRT2Data_4_E = 0x0; +static unsigned char XGI330_CRT2Data_1_2; +static unsigned char XGI330_CRT2Data_4_D; +static unsigned char XGI330_CRT2Data_4_E; static unsigned char XGI330_CRT2Data_4_10 = 0x80; static unsigned short XGI330_RGBSenseData = 0xd1; static unsigned short XGI330_VideoSenseData = 0xb9; @@ -2971,14 +2917,14 @@ static unsigned short XGI330_YCSenseData = 0xb3; static unsigned short XGI330_RGBSenseData2 = 0x0190; /*301b*/ static unsigned short XGI330_VideoSenseData2 = 0x0110; static unsigned short XGI330_YCSenseData2 = 0x016B; -static unsigned char XG40_I2CDefinition = 0x00 ; +static unsigned char XG40_I2CDefinition; static unsigned char XG20_CR97 = 0x10 ; -static unsigned char XG21_DVOSetting = 0x00 ; -static unsigned char XG21_CR2E = 0x00 ; -static unsigned char XG21_CR2F = 0x00 ; -static unsigned char XG21_CR46 = 0x00 ; -static unsigned char XG21_CR47 = 0x00 ; +static unsigned char XG21_DVOSetting; +static unsigned char XG21_CR2E; +static unsigned char XG21_CR2F; +static unsigned char XG21_CR46; +static unsigned char XG21_CR47; static unsigned char XG27_CR97 = 0xC1 ; static unsigned char XG27_SR36 = 0x30 ; @@ -2986,7 +2932,7 @@ static unsigned char XG27_CR8F = 0x0C ; static unsigned char XG27_CRD0[] = { 0, 0, 0, 0, 0, 0, 0, 0x82, 0x00, 0x66, 0x01, 0x00 }; -static unsigned char XG27_CRDE[] = {0, 0}; +static unsigned char XG27_CRDE[2]; static unsigned char XG27_SR40 = 0x04 ; static unsigned char XG27_SR41 = 0x00 ; -- GitLab