hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: xgifb: XGI_DisableBridge(): delete redundant checks 

Delete some redudant checks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2013-05-29 23:59:12 +03:00 committed by Greg Kroah-Hartman
parent 056b5405fa
commit 41fc5f031c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/xgifb/vb_setmode.c
View File

@ -4553,13 +4553,8 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
if (!(pVBInfo->VBInfo & if (!(pVBInfo->VBInfo &
(DisableCRT2Display | SetSimuScanMode))) { (DisableCRT2Display | SetSimuScanMode))) {
if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
if (pVBInfo->VBInfo & SetCRT2ToDualEdge) { if (pVBInfo->VBInfo & SetCRT2ToDualEdge)
tempah = 0x7F; /* Disable Channel A */ tempah = 0x7F; /* Disable Channel A */
if (!(pVBInfo->VBInfo &
XGI_SetCRT2ToLCDA))
/* Disable Channel B */
tempah = 0xBF;
}
} }
} }
@ -4578,11 +4573,9 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
SetSimuScanMode)) SetSimuScanMode))
XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo); XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)
if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) /* Power down */
/* Power down */ xgifb_reg_and(pVBInfo->Part1Port, 0x1e, 0xdf);
xgifb_reg_and(pVBInfo->Part1Port, 0x1e, 0xdf);
}
/* disable TV as primary VGA swap */ /* disable TV as primary VGA swap */
xgifb_reg_and(pVBInfo->P3c4, 0x32, 0xdf); xgifb_reg_and(pVBInfo->P3c4, 0x32, 0xdf);