diff options
author | Andy Shevchenko <ext-andriy.shevchenko@nokia.com> | 2010-02-02 17:40:32 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-02-10 23:28:00 -0500 |
commit | 3b40a4434f4d65321332dec590a079d7a75077d8 (patch) | |
tree | c04b2d9daaaabb0a3ad3b249759291996ff05949 /drivers/gpu/drm/drm_fb_helper.c | |
parent | 9a1420d1185693b6e24719d3937a0c20a3e0e31d (diff) |
drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
Kernel has simple_strtol() which would be used as atoi().
This is quite the same fix as in 2cb96f86628d6e97fcbda5fe4d8d74876239834c
("fbdev: drop custom atoi from drivers/video/modedb.c") because code in
drivers/gpu/drm/drm_fb_helper.c is based on drivers/video/modedb.c.
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0f9e90552dc4..989c4debbecb 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -27,6 +27,7 @@ | |||
27 | * Dave Airlie <airlied@linux.ie> | 27 | * Dave Airlie <airlied@linux.ie> |
28 | * Jesse Barnes <jesse.barnes@intel.com> | 28 | * Jesse Barnes <jesse.barnes@intel.com> |
29 | */ | 29 | */ |
30 | #include <linux/kernel.h> | ||
30 | #include <linux/sysrq.h> | 31 | #include <linux/sysrq.h> |
31 | #include <linux/fb.h> | 32 | #include <linux/fb.h> |
32 | #include "drmP.h" | 33 | #include "drmP.h" |
@@ -50,21 +51,6 @@ int drm_fb_helper_add_connector(struct drm_connector *connector) | |||
50 | } | 51 | } |
51 | EXPORT_SYMBOL(drm_fb_helper_add_connector); | 52 | EXPORT_SYMBOL(drm_fb_helper_add_connector); |
52 | 53 | ||
53 | static int my_atoi(const char *name) | ||
54 | { | ||
55 | int val = 0; | ||
56 | |||
57 | for (;; name++) { | ||
58 | switch (*name) { | ||
59 | case '0' ... '9': | ||
60 | val = 10*val+(*name-'0'); | ||
61 | break; | ||
62 | default: | ||
63 | return val; | ||
64 | } | ||
65 | } | ||
66 | } | ||
67 | |||
68 | /** | 54 | /** |
69 | * drm_fb_helper_connector_parse_command_line - parse command line for connector | 55 | * drm_fb_helper_connector_parse_command_line - parse command line for connector |
70 | * @connector - connector to parse line for | 56 | * @connector - connector to parse line for |
@@ -111,7 +97,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con | |||
111 | namelen = i; | 97 | namelen = i; |
112 | if (!refresh_specified && !bpp_specified && | 98 | if (!refresh_specified && !bpp_specified && |
113 | !yres_specified) { | 99 | !yres_specified) { |
114 | refresh = my_atoi(&name[i+1]); | 100 | refresh = simple_strtol(&name[i+1], NULL, 10); |
115 | refresh_specified = 1; | 101 | refresh_specified = 1; |
116 | if (cvt || rb) | 102 | if (cvt || rb) |
117 | cvt = 0; | 103 | cvt = 0; |
@@ -121,7 +107,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con | |||
121 | case '-': | 107 | case '-': |
122 | namelen = i; | 108 | namelen = i; |
123 | if (!bpp_specified && !yres_specified) { | 109 | if (!bpp_specified && !yres_specified) { |
124 | bpp = my_atoi(&name[i+1]); | 110 | bpp = simple_strtol(&name[i+1], NULL, 10); |
125 | bpp_specified = 1; | 111 | bpp_specified = 1; |
126 | if (cvt || rb) | 112 | if (cvt || rb) |
127 | cvt = 0; | 113 | cvt = 0; |
@@ -130,7 +116,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con | |||
130 | break; | 116 | break; |
131 | case 'x': | 117 | case 'x': |
132 | if (!yres_specified) { | 118 | if (!yres_specified) { |
133 | yres = my_atoi(&name[i+1]); | 119 | yres = simple_strtol(&name[i+1], NULL, 10); |
134 | yres_specified = 1; | 120 | yres_specified = 1; |
135 | } else | 121 | } else |
136 | goto done; | 122 | goto done; |
@@ -170,7 +156,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con | |||
170 | } | 156 | } |
171 | } | 157 | } |
172 | if (i < 0 && yres_specified) { | 158 | if (i < 0 && yres_specified) { |
173 | xres = my_atoi(name); | 159 | xres = simple_strtol(name, NULL, 10); |
174 | res_specified = 1; | 160 | res_specified = 1; |
175 | } | 161 | } |
176 | done: | 162 | done: |