Commit 056b5405 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: xgifb: XGI_EnableChISLCD(): delete trivial function

The function returns always false, delete it.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2526d1f
...@@ -4541,23 +4541,6 @@ static unsigned char XGI_IsLCDON(struct vb_device_info *pVBInfo) ...@@ -4541,23 +4541,6 @@ static unsigned char XGI_IsLCDON(struct vb_device_info *pVBInfo)
return 0; return 0;
} }
/* --------------------------------------------------------------------- */
/* Function : XGI_EnableChISLCD */
/* Input : */
/* Output : 0 -> Not LCD mode */
/* Description : if bool enable = true -> enable, else disable */
/* --------------------------------------------------------------------- */
static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo,
bool enable)
{
unsigned short tempbx, tempah;
tempbx = 0;
tempah = ~((unsigned short) xgifb_reg_get(pVBInfo->Part1Port, 0x2E));
return 0;
}
static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
struct xgi_hw_device_info *HwDeviceExtension, struct xgi_hw_device_info *HwDeviceExtension,
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
...@@ -4586,7 +4569,6 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info, ...@@ -4586,7 +4569,6 @@ static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) { if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) {
if (((pVBInfo->VBInfo & if (((pVBInfo->VBInfo &
(SetCRT2ToLCD | XGI_SetCRT2ToLCDA))) || (SetCRT2ToLCD | XGI_SetCRT2ToLCDA))) ||
(XGI_EnableChISLCD(pVBInfo, false)) ||
(XGI_IsLCDON(pVBInfo))) (XGI_IsLCDON(pVBInfo)))
/* LVDS Driver power down */ /* LVDS Driver power down */
xgifb_reg_or(pVBInfo->Part4Port, 0x30, 0x80); xgifb_reg_or(pVBInfo->Part4Port, 0x30, 0x80);
...@@ -5480,16 +5462,11 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info, ...@@ -5480,16 +5462,11 @@ static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
xgifb_reg_and_or(pVBInfo->Part2Port, 0x00, ~0xE0, xgifb_reg_and_or(pVBInfo->Part2Port, 0x00, ~0xE0,
0x20); /* shampoo 0129 */ 0x20); /* shampoo 0129 */
if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) { if (pVBInfo->VBType & (VB_SIS302LV | VB_XGI301C)) {
if (!XGI_EnableChISLCD(pVBInfo, false)) { if (pVBInfo->VBInfo &
if (XGI_EnableChISLCD(pVBInfo, true) || (SetCRT2ToLCD | XGI_SetCRT2ToLCDA))
(pVBInfo->VBInfo & /* LVDS PLL power on */
(SetCRT2ToLCD | XGI_SetCRT2ToLCDA))) xgifb_reg_and(pVBInfo->Part4Port, 0x2A,
/* LVDS PLL power on */ 0x7F);
xgifb_reg_and(
pVBInfo->Part4Port,
0x2A,
0x7F);
}
/* LVDS Driver power on */ /* LVDS Driver power on */
xgifb_reg_and(pVBInfo->Part4Port, 0x30, 0x7F); xgifb_reg_and(pVBInfo->Part4Port, 0x30, 0x7F);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment