diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-02-08 17:03:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-08 18:39:58 -0500 |
commit | 22006839a265c69fa56fbe9fadbd5c5e8c9d9736 (patch) | |
tree | 5866b950064edd37f7930df7d11481c82161a8c5 | |
parent | 718e715d1a0182b5f6483bf82fae7c6b337bb16d (diff) |
staging: xgifb: XGI_GetCRT2ResInfo(): 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>
-rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index 872eea422080..2f9046439b0d 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c | |||
@@ -2526,36 +2526,34 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo, | |||
2526 | if (!(pVBInfo->VBInfo & SetCRT2ToLCD)) | 2526 | if (!(pVBInfo->VBInfo & SetCRT2ToLCD)) |
2527 | goto exit; | 2527 | goto exit; |
2528 | 2528 | ||
2529 | if (pVBInfo->IF_DEF_LVDS == 0) { | 2529 | if (pVBInfo->LCDResInfo == Panel_1600x1200) { |
2530 | if (pVBInfo->LCDResInfo == Panel_1600x1200) { | 2530 | if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) { |
2531 | if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) { | 2531 | if (yres == 1024) |
2532 | if (yres == 1024) | 2532 | yres = 1056; |
2533 | yres = 1056; | ||
2534 | } | ||
2535 | } | 2533 | } |
2534 | } | ||
2536 | 2535 | ||
2537 | if (pVBInfo->LCDResInfo == Panel_1280x1024) { | 2536 | if (pVBInfo->LCDResInfo == Panel_1280x1024) { |
2538 | if (yres == 400) | 2537 | if (yres == 400) |
2539 | yres = 405; | 2538 | yres = 405; |
2540 | else if (yres == 350) | 2539 | else if (yres == 350) |
2541 | yres = 360; | 2540 | yres = 360; |
2542 | 2541 | ||
2543 | if (pVBInfo->LCDInfo & XGI_LCDVESATiming) { | 2542 | if (pVBInfo->LCDInfo & XGI_LCDVESATiming) { |
2544 | if (yres == 360) | 2543 | if (yres == 360) |
2545 | yres = 375; | 2544 | yres = 375; |
2546 | } | ||
2547 | } | 2545 | } |
2546 | } | ||
2548 | 2547 | ||
2549 | if (pVBInfo->LCDResInfo == Panel_1024x768) { | 2548 | if (pVBInfo->LCDResInfo == Panel_1024x768) { |
2550 | if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) { | 2549 | if (!(pVBInfo->LCDInfo & XGI_LCDVESATiming)) { |
2551 | if (!(pVBInfo->LCDInfo & LCDNonExpanding)) { | 2550 | if (!(pVBInfo->LCDInfo & LCDNonExpanding)) { |
2552 | if (yres == 350) | 2551 | if (yres == 350) |
2553 | yres = 357; | 2552 | yres = 357; |
2554 | else if (yres == 400) | 2553 | else if (yres == 400) |
2555 | yres = 420; | 2554 | yres = 420; |
2556 | else if (yres == 480) | 2555 | else if (yres == 480) |
2557 | yres = 525; | 2556 | yres = 525; |
2558 | } | ||
2559 | } | 2557 | } |
2560 | } | 2558 | } |
2561 | } | 2559 | } |