diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-30 00:59:06 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 15:55:49 +0400 |
| commit | ae424a3d6e2544d36ac9da952098f262599fca8d (patch) | |
| tree | b34e3a7183c2691548339e9ca63fc706b5563459 | |
| parent | b750f51661695b627c2ccc141913d64268fe8b38 (diff) | |
| download | linux-ae424a3d6e2544d36ac9da952098f262599fca8d.tar.xz | |
staging: xgifb: SetFlag: delete GatingCRT
This flag is never set, so checks can be removed and code behind it
deleted.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/xgifb/vb_def.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 19 |
2 files changed, 3 insertions, 17 deletions
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h index 80c972305885..cd082cae854d 100644 --- a/drivers/staging/xgifb/vb_def.h +++ b/drivers/staging/xgifb/vb_def.h @@ -30,7 +30,6 @@ #define SetCRT2ToDualEdge 0x8000 #define ReserveTVOption 0x0008 -#define GatingCRT 0x0800 #define DisableChB 0x1000 #define EnableChB 0x2000 #define DisableChA 0x4000 diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 69b6a960888d..78fcf0bbbd19 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -4283,12 +4283,6 @@ static void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex, return; } -static void XGI_EnableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, - struct vb_device_info *pVBInfo) -{ - xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x40); -} - static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, struct vb_device_info *pVBInfo) { @@ -4623,11 +4617,8 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo & (DisableCRT2Display | XGI_SetCRT2ToLCDA - | SetSimuScanMode))) { - if (pVBInfo->SetFlag & GatingCRT) - XGI_EnableGatingCRT(HwDeviceExtension, pVBInfo); + | SetSimuScanMode))) XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo); - } if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) { if ((pVBInfo->SetFlag & DisableChA) || (pVBInfo->VBInfo @@ -5572,12 +5563,8 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah); if (!(pVBInfo->SetFlag & DisableChA)) { - if (!(pVBInfo->SetFlag & GatingCRT)) { - XGI_DisableGatingCRT(HwDeviceExtension, - pVBInfo); - XGI_DisplayOn(xgifb_info, HwDeviceExtension, - pVBInfo); - } + XGI_DisableGatingCRT(HwDeviceExtension, pVBInfo); + XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo); } } /* 301 */ else { /* LVDS */ |