diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 23:59:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:55:51 +0900 |
| commit | 41fc5f031c87c97006f308bf19a6d309c3a37020 (patch) | |
| tree | 269668254c055fdaa3859b0d3626ce040cd74a1e /drivers/staging/xgifb/vb_setmode.c | |
| parent | 056b5405fa0083aeaf5c22157c19870b67884112 (diff) | |
| download | op-kernel-dev-41fc5f031c87c97006f308bf19a6d309c3a37020.zip op-kernel-dev-41fc5f031c87c97006f308bf19a6d309c3a37020.tar.gz | |
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>
Diffstat (limited to 'drivers/staging/xgifb/vb_setmode.c')
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 73ee8ec..65eea65 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4553,13 +4553,8 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, if (!(pVBInfo->VBInfo & (DisableCRT2Display | SetSimuScanMode))) { if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { - if (pVBInfo->VBInfo & SetCRT2ToDualEdge) { + if (pVBInfo->VBInfo & SetCRT2ToDualEdge) 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)) XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo); - if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { - if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) - /* Power down */ - xgifb_reg_and(pVBInfo->Part1Port, 0x1e, 0xdf); - } + if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) + /* Power down */ + xgifb_reg_and(pVBInfo->Part1Port, 0x1e, 0xdf); /* disable TV as primary VGA swap */ xgifb_reg_and(pVBInfo->P3c4, 0x32, 0xdf); |
