evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/xgifb: remove unnecessary temp variable in XGIfb_mode_rate_to_ddata

Browse source 
Instead of subtracting one and then assign a different name and add 1
again we simply use HDE directly. HDE wasn't used directly before, so no
change in functionality.
Same applies to VDE.

-> now we can remove the variable with the very descriptive name E ;)

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2013-02-03 22:54:36 +01:00 • committed by Greg Kroah-Hartman
parent bae31702cd
commit a5e080b83e
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/staging/xgifb/XGI_main_26.c
View file

@ -94,7 +94,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
unsigned short VRE, VBE, VRS, VDE; unsigned short VRE, VBE, VRS, VDE;
unsigned short HRE, HBE, HRS, HDE; unsigned short HRE, HBE, HRS, HDE;
unsigned char sr_data, cr_data, cr_data2; unsigned char sr_data, cr_data, cr_data2;
int B, C, D, E, F, temp, j; int B, C, D, F, temp, j;
InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr); InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
if (!XGI_SearchModeID(ModeNo, &ModeIdIndex, XGI_Pr)) if (!XGI_SearchModeID(ModeNo, &ModeIdIndex, XGI_Pr))
return 0; return 0;
@ -104,14 +104,13 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
sr_data = XGI_CRT1Table[index].CR[5]; sr_data = XGI_CRT1Table[index].CR[5];
HDE = (XGI330_RefIndex[RefreshRateTableIndex].XRes >> 3) - 1; HDE = (XGI330_RefIndex[RefreshRateTableIndex].XRes >> 3);
E = HDE + 1;
cr_data = XGI_CRT1Table[index].CR[3]; cr_data = XGI_CRT1Table[index].CR[3];
/* Horizontal retrace (=sync) start */ /* Horizontal retrace (=sync) start */
HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2); HRS = (cr_data & 0xff) | ((unsigned short) (sr_data & 0xC0) << 2);
F = HRS - E - 3; F = HRS - HDE - 3;
sr_data = XGI_CRT1Table[index].CR[6]; sr_data = XGI_CRT1Table[index].CR[6];
@ -126,10 +125,10 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
/* Horizontal retrace (=sync) end */ /* Horizontal retrace (=sync) end */
HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3); HRE = (cr_data2 & 0x1f) | ((sr_data & 0x04) << 3);
temp = HBE - ((E - 1) & 255); temp = HBE - ((HDE - 1) & 255);
B = (temp > 0) ? temp : (temp + 256); B = (temp > 0) ? temp : (temp + 256);
temp = HRE - ((E + F + 3) & 63); temp = HRE - ((HDE + F + 3) & 63);
C = (temp > 0) ? temp : (temp + 64); C = (temp > 0) ? temp : (temp + 64);
D = B - F - C; D = B - F - C;
@ -142,8 +141,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
cr_data2 = XGI_CRT1Table[index].CR[9]; cr_data2 = XGI_CRT1Table[index].CR[9];
VDE = XGI330_RefIndex[RefreshRateTableIndex].YRes - 1; VDE = XGI330_RefIndex[RefreshRateTableIndex].YRes;
E = VDE + 1;
cr_data = XGI_CRT1Table[index].CR[10]; cr_data = XGI_CRT1Table[index].CR[10];
@ -151,20 +149,20 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6) VRS = (cr_data & 0xff) | ((unsigned short) (cr_data2 & 0x04) << 6)
| ((unsigned short) (cr_data2 & 0x80) << 2) | ((unsigned short) (cr_data2 & 0x80) << 2)
| ((unsigned short) (sr_data & 0x08) << 7); | ((unsigned short) (sr_data & 0x08) << 7);
F = VRS + 1 - E; F = VRS + 1 - VDE;
cr_data = XGI_CRT1Table[index].CR[13]; cr_data = XGI_CRT1Table[index].CR[13];
/* Vertical blank end */ /* Vertical blank end */
VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4); VBE = (cr_data & 0xff) | ((unsigned short) (sr_data & 0x10) << 4);
temp = VBE - ((E - 1) & 511); temp = VBE - ((VDE - 1) & 511);
B = (temp > 0) ? temp : (temp + 512); B = (temp > 0) ? temp : (temp + 512);
cr_data = XGI_CRT1Table[index].CR[11]; cr_data = XGI_CRT1Table[index].CR[11];
/* Vertical retrace (=sync) end */ /* Vertical retrace (=sync) end */
VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1); VRE = (cr_data & 0x0f) | ((sr_data & 0x20) >> 1);
temp = VRE - ((E + F - 1) & 31); temp = VRE - ((VDE + F - 1) & 31);
C = (temp > 0) ? temp : (temp + 32); C = (temp > 0) ? temp : (temp + 32);
D = B - F - C; D = B - F - C;