Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 10 insertions, 23 deletions

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 34e4e7995169..0a4dbdc1693a 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -12,7 +12,9 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/fb.h>
+#include <linux/kernel.h>
 
 #undef DEBUG
 
@@ -402,21 +404,6 @@ const struct fb_videomode vesa_modes[] = {
 EXPORT_SYMBOL(vesa_modes);
 #endif /* CONFIG_FB_MODE_HELPERS */
 
-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;
-        }
-    }
-}
-
 /**
  *      fb_try_mode - test a video mode
  *      @var: frame buffer user defined part of display
@@ -539,7 +526,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     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;
@@ -549,7 +536,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                 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;
@@ -558,7 +545,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
                     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;
@@ -586,7 +573,7 @@ int fb_find_mode(struct fb_var_screeninfo *var,
             }
         }
         if (i < 0 && yres_specified) {
-            xres = my_atoi(name);
+            xres = simple_strtol(name, NULL, 10);
             res_specified = 1;
         }
 done:
@@ -907,7 +894,7 @@ const struct fb_videomode *fb_match_mode(const struct fb_var_screeninfo *var,
 }
 
 /**
- * fb_add_videomode: adds videomode entry to modelist
+ * fb_add_videomode - adds videomode entry to modelist
  * @mode: videomode to add
  * @head: struct list_head of modelist
  *
@@ -942,7 +929,7 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
 }
 
 /**
- * fb_delete_videomode: removed videomode entry from modelist
+ * fb_delete_videomode - removed videomode entry from modelist
  * @mode: videomode to remove
  * @head: struct list_head of modelist
  *
@@ -967,7 +954,7 @@ void fb_delete_videomode(const struct fb_videomode *mode,
 }
 
 /**
- * fb_destroy_modelist: destroy modelist
+ * fb_destroy_modelist - destroy modelist
  * @head: struct list_head of modelist
  */
 void fb_destroy_modelist(struct list_head *head)
@@ -982,7 +969,7 @@ void fb_destroy_modelist(struct list_head *head)
 EXPORT_SYMBOL_GPL(fb_destroy_modelist);
 
 /**
- * fb_videomode_to_modelist: convert mode array to mode list
+ * fb_videomode_to_modelist - convert mode array to mode list
  * @modedb: array of struct fb_videomode
  * @num: number of entries in array
  * @head: struct list_head of modelist