From: Aaro Koskinen Date: Mon, 29 Aug 2011 20:14:19 +0000 (+0300) Subject: staging: xgifb: delete duplicated code X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~808 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=20fc30b9412013f96005e5d8de6af6c555d6650f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: xgifb: delete duplicated code Delete redundant branches for "mode" and "vesa" options. 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 eca5ed74feb5..ceb0883ebf05 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1954,11 +1954,6 @@ static int __init XGIfb_setup(char *options) } else if (!strncmp(this_opt, "vesa:", 5)) { XGIfb_search_vesamode(simple_strtoul( this_opt + 5, NULL, 0)); - } else if (!strncmp(this_opt, "mode:", 5)) { - XGIfb_search_mode(this_opt + 5); - } else if (!strncmp(this_opt, "vesa:", 5)) { - XGIfb_search_vesamode(simple_strtoul( - this_opt + 5, NULL, 0)); } else if (!strncmp(this_opt, "vrate:", 6)) { xgi_video_info.refresh_rate = simple_strtoul( this_opt + 6, NULL, 0);