openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: modes: replace simple_strtoul by kstrtouint 

The simple_strtoul function is marked as obsolete.
This patch replace it by kstrtouint.

Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
LABBE Corentin 2015-11-05 10:33:54 +01:00 committed by Daniel Vetter
parent d9c3824217
commit cc344980c7
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/drm_modes.c
View File

@ -1230,7 +1230,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
unsigned int xres = 0, yres = 0, bpp = 32, refresh = 0; unsigned int xres = 0, yres = 0, bpp = 32, refresh = 0;
bool yres_specified = false, cvt = false, rb = false; bool yres_specified = false, cvt = false, rb = false;
bool interlace = false, margins = false, was_digit = false; bool interlace = false, margins = false, was_digit = false;
int i; int i, err;
enum drm_connector_force force = DRM_FORCE_UNSPECIFIED; enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
#ifdef CONFIG_FB #ifdef CONFIG_FB
@ -1250,7 +1250,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
case '@': case '@':
if (!refresh_specified && !bpp_specified && if (!refresh_specified && !bpp_specified &&
!yres_specified && !cvt && !rb && was_digit) { !yres_specified && !cvt && !rb && was_digit) {
refresh = simple_strtol(&name[i+1], NULL, 10); err = kstrtouint(&name[i + 1], 10, &refresh);
if (err)
return false;
refresh_specified = true; refresh_specified = true;
was_digit = false; was_digit = false;
} else } else
@ -1259,7 +1261,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
case '-': case '-':
if (!bpp_specified && !yres_specified && !cvt && if (!bpp_specified && !yres_specified && !cvt &&
!rb && was_digit) { !rb && was_digit) {
bpp = simple_strtol(&name[i+1], NULL, 10); err = kstrtouint(&name[i + 1], 10, &bpp);
if (err)
return false;
bpp_specified = true; bpp_specified = true;
was_digit = false; was_digit = false;
} else } else
@ -1267,7 +1271,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
break; break;
case 'x': case 'x':
if (!yres_specified && was_digit) { if (!yres_specified && was_digit) {
yres = simple_strtol(&name[i+1], NULL, 10); err = kstrtouint(&name[i + 1], 10, &yres);
if (err)
return false;
yres_specified = true; yres_specified = true;
was_digit = false; was_digit = false;
} else } else
@ -1491,4 +1497,4 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
out: out:
return ret; return ret;
} }