drm: modes: replace simple_strtoul by kstrtouint
authorLABBE Corentin <clabbe.montjoie@gmail.com>
Thu, 5 Nov 2015 09:33:54 +0000 (10:33 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 24 Nov 2015 10:41:53 +0000 (11:41 +0100)
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>
drivers/gpu/drm/drm_modes.c

index cd74a0953f42475c956d08b8339b59e64ff9b4de..bde9b2911dc2023f4b3a6a3611643ca362c423c1 100644 (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;
        bool yres_specified = false, cvt = false, rb = false;
        bool interlace = false, margins = false, was_digit = false;
-       int i;
+       int i, err;
        enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
 
 #ifdef CONFIG_FB
@@ -1250,7 +1250,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
                case '@':
                        if (!refresh_specified && !bpp_specified &&
                            !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;
                                was_digit = false;
                        } else
@@ -1259,7 +1261,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
                case '-':
                        if (!bpp_specified && !yres_specified && !cvt &&
                            !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;
                                was_digit = false;
                        } else
@@ -1267,7 +1271,9 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
                        break;
                case 'x':
                        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;
                                was_digit = false;
                        } else
@@ -1491,4 +1497,4 @@ int drm_mode_convert_umode(struct drm_display_mode *out,
 
 out:
        return ret;
-}
\ No newline at end of file
+}