diff options
| author | Aaro Koskinen | 2012-04-07 00:13:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-04-10 19:19:08 +0200 |
| commit | f9e5de0f175d114a850630f4e86a2eed4f7a7a75 (patch) | |
| tree | efcf4a3a72d5b1e6adbb95bd66f9fd3aeefb9980 /drivers/staging/xgifb/XGI_main_26.c | |
| parent | staging: xgifb: delete rate_idx from mode table (diff) | |
| download | kernel-qcow2-linux-f9e5de0f175d114a850630f4e86a2eed4f7a7a75.tar.gz kernel-qcow2-linux-f9e5de0f175d114a850630f4e86a2eed4f7a7a75.tar.xz kernel-qcow2-linux-f9e5de0f175d114a850630f4e86a2eed4f7a7a75.zip | |
staging: xgifb: eliminate string comparison from mode search
Eliminate string comparison from the video mode search.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 5982c0d6f1a3..85dbf32b1f66 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -390,19 +390,26 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info) static void XGIfb_search_mode(struct xgifb_video_info *xgifb_info, const char *name) { - int i = 0, j = 0, l; + unsigned int xres; + unsigned int yres; + unsigned int bpp; + int i; - while (XGIbios_mode[i].mode_no != 0) { - l = min(strlen(name), strlen(XGIbios_mode[i].name)); - if (!strncmp(name, XGIbios_mode[i].name, l)) { + if (sscanf(name, "%ux%ux%u", &xres, &yres, &bpp) != 3) + goto invalid_mode; + + if (bpp == 24) + bpp = 32; /* That's for people who mix up color and fb depth. */ + + for (i = 0; XGIbios_mode[i].mode_no != 0; i++) + if (XGIbios_mode[i].xres == xres && + XGIbios_mode[i].yres == yres && + XGIbios_mode[i].bpp == bpp) { xgifb_info->mode_idx = i; - j = 1; - break; + return; } - i++; - } - if (!j) - pr_info("Invalid mode '%s'\n", name); +invalid_mode: + pr_info("Invalid mode '%s'\n", name); } static void XGIfb_search_vesamode(struct xgifb_video_info *xgifb_info, |