diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-08-29 23:14:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 11:41:24 -0700 |
| commit | c8bec1f067b08a7a3baa66e6d8ab98aeda7df8d2 (patch) | |
| tree | 63ca26570aaaeac69336fd09b11947ef811d2b27 /drivers/staging/xgifb/XGI_main_26.c | |
| parent | de736dbb2253679806a281f125983f58d1ae1218 (diff) | |
staging: xgifb: simplify default mode setup
The default mode is the same regardless of the display type, except for
XG21/LCD which is determined dynamically.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index e989eb4e516..ff0392bb029 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2297,20 +2297,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx); if (xgifb_mode_idx < 0) { - switch (xgi_video_info.disp_state & DISPTYPE_DISP2) { - case DISPTYPE_LCD: - xgifb_mode_idx = DEFAULT_LCDMODE; - if (xgi_video_info.chip == XG21) - xgifb_mode_idx = - XGIfb_GetXG21DefaultLVDSModeIdx(); - break; - case DISPTYPE_TV: - xgifb_mode_idx = DEFAULT_TVMODE; - break; - default: + if ((xgi_video_info.disp_state & DISPTYPE_DISP2) == + DISPTYPE_LCD && + xgi_video_info.chip == XG21) + xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx(); + else xgifb_mode_idx = DEFAULT_MODE; - break; - } } if (xgifb_mode_idx < 0) { |