Skip to contentSkip to conversation

drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()

PATCH New [email protected] 1 participant 1 message Feb 2, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/6 drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()

From: Andy Shevchenko <[email protected]>

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.

---

 drivers/gpu/drm/drm_fb_helper.c |   24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)
drivers/gpu/drm/drm_fb_helper.c renamed from drivers/gpu/drm/drm_fb_helper.c~drm-dont-use-own-implementation-of-atoi +5 -19
diff -puN drivers/gpu/drm/drm_fb_helper.c~drm-dont-use-own-implementation-of-atoi drivers/gpu/drm/drm_fb_helper.c
@@ -27,6 +27,7 @@
  *      Dave Airlie <[email protected]>
  *      Jesse Barnes <[email protected]>
  */
+#include <linux/kernel.h>
 #include <linux/sysrq.h>
 #include <linux/fb.h>
 #include <linux/kgdb.h>
@@ -51,21 +52,6 @@ int drm_fb_helper_add_connector(struct d
 }
 EXPORT_SYMBOL(drm_fb_helper_add_connector);
 
-static int my_atoi(const char *name)
-{
-	int val = 0;
-
-	for (;; name++) {
-		switch (*name) {
-		case '0' ... '9':
-			val = 10*val+(*name-'0');
-			break;
-		default:
-			return val;
-		}
-	}
-}
-
 /**
  * drm_fb_helper_connector_parse_command_line - parse command line for connector
  * @connector - connector to parse line for
@@ -112,7 +98,7 @@ static bool drm_fb_helper_connector_pars
 			namelen = i;
 			if (!refresh_specified && !bpp_specified &&
 			    !yres_specified) {
-				refresh = my_atoi(&name[i+1]);
+				refresh = simple_strtol(&name[i+1], NULL, 10);
 				refresh_specified = 1;
 				if (cvt || rb)
 					cvt = 0;
@@ -122,7 +108,7 @@ static bool drm_fb_helper_connector_pars
 		case '-':
 			namelen = i;
 			if (!bpp_specified && !yres_specified) {
-				bpp = my_atoi(&name[i+1]);
+				bpp = simple_strtol(&name[i+1], NULL, 10);
 				bpp_specified = 1;
 				if (cvt || rb)
 					cvt = 0;
@@ -131,7 +117,7 @@ static bool drm_fb_helper_connector_pars
 			break;
 		case 'x':
 			if (!yres_specified) {
-				yres = my_atoi(&name[i+1]);
+				yres = simple_strtol(&name[i+1], NULL, 10);
 				yres_specified = 1;
 			} else
 				goto done;
@@ -171,7 +157,7 @@ static bool drm_fb_helper_connector_pars
 		}
 	}
 	if (i < 0 && yres_specified) {
-		xres = my_atoi(name);
+		xres = simple_strtol(name, NULL, 10);
 		res_specified = 1;
 	}
 done:

_

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
--