summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/vb_setmode.c
diff options
context:
space:
mode:
authorAaro Koskinen2013-02-08 23:03:46 +0100
committerGreg Kroah-Hartman2013-02-09 00:39:58 +0100
commit718e715d1a0182b5f6483bf82fae7c6b337bb16d (patch)
treebd2bdf51a25f297d0f5dd612177da0ffd8c12cfc /drivers/staging/xgifb/vb_setmode.c
parentstaging: xgifb: XGI_GetTVInfo(): delete IF_DEF_LVDS checks (diff)
downloadkernel-qcow2-linux-718e715d1a0182b5f6483bf82fae7c6b337bb16d.tar.gz
kernel-qcow2-linux-718e715d1a0182b5f6483bf82fae7c6b337bb16d.tar.xz
kernel-qcow2-linux-718e715d1a0182b5f6483bf82fae7c6b337bb16d.zip
staging: xgifb: XGI_GetLCDInfo(): delete IF_DEF_LVDS check
Delete IF_DEF_LVDS check, this function is never called when it's true. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb/vb_setmode.c')
-rw-r--r--drivers/staging/xgifb/vb_setmode.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index faa25b9218c2..872eea422080 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -2240,21 +2240,18 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
tempax = pVBInfo->LCDCapList[LCDIdIndex].LCD_Capability;
- if (pVBInfo->IF_DEF_LVDS == 0) { /* shampoo */
- if (((pVBInfo->VBType & VB_SIS302LV) || (pVBInfo->VBType
- & VB_XGI301C)) && (tempax & XGI_LCDDualLink)) {
- tempbx |= SetLCDDualLink;
- }
-
- if ((pVBInfo->LCDResInfo == Panel_1400x1050) && (pVBInfo->VBInfo
- & SetCRT2ToLCD) && (resinfo == 9) &&
- (!(tempbx & EnableScalingLCD)))
- /*
- * set to center in 1280x1024 LCDB
- * for Panel_1400x1050
- */
- tempbx |= SetLCDtoNonExpanding;
- }
+ if (((pVBInfo->VBType & VB_SIS302LV) ||
+ (pVBInfo->VBType & VB_XGI301C)) && (tempax & XGI_LCDDualLink))
+ tempbx |= SetLCDDualLink;
+
+ if ((pVBInfo->LCDResInfo == Panel_1400x1050) &&
+ (pVBInfo->VBInfo & SetCRT2ToLCD) && (resinfo == 9) &&
+ (!(tempbx & EnableScalingLCD)))
+ /*
+ * set to center in 1280x1024 LCDB
+ * for Panel_1400x1050
+ */
+ tempbx |= SetLCDtoNonExpanding;
if (pVBInfo->VBInfo & SetInSlaveMode) {
if (pVBInfo->VBInfo & SetNotSimuMode)