From: Aaro Koskinen Date: Mon, 29 Aug 2011 20:14:28 +0000 (+0300) Subject: staging: xgifb: delete duplicated default video mode setup code X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35c064da1b0c9525f51bb84e9ce55aa5961063f0;p=mv-sheeva.git staging: xgifb: delete duplicated default video mode setup code The code for determining the default video mode is unnecessarily duplicated in XGIfb_search_mode() and XGIfb_search_vesamode() functions. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 074fe4f9606..34678a3b0fc 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -460,12 +460,6 @@ static void XGIfb_search_mode(const char *name) if (!strcmp(name, XGIbios_mode[MODE_INDEX_NONE].name)) { printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - xgifb_mode_idx = DEFAULT_MODE; - if ((xgi_video_info.chip == XG21) - && ((xgi_video_info.disp_state & DISPTYPE_DISP2) - == DISPTYPE_LCD)) { - xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx(); - } return; } @@ -489,12 +483,6 @@ static void XGIfb_search_vesamode(unsigned int vesamode) if (vesamode == 0) { printk(KERN_ERR "XGIfb: Mode 'none' not supported anymore. Using default.\n"); - xgifb_mode_idx = DEFAULT_MODE; - if ((xgi_video_info.chip == XG21) - && ((xgi_video_info.disp_state & DISPTYPE_DISP2) - == DISPTYPE_LCD)) { - xgifb_mode_idx = XGIfb_GetXG21DefaultLVDSModeIdx(); - } return; }