1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c
index a436d44f1b7f..90c51330969c 100644
--- a/drivers/video/fbdev/sbuslib.c
+++ b/drivers/video/fbdev/sbuslib.c
@@ -106,11 +106,11 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
                 struct fbtype __user *f = (struct fbtype __user *) arg;
 
                 if (put_user(type, &f->fb_type) ||
-                    __put_user(info->var.yres, &f->fb_height) ||
-                    __put_user(info->var.xres, &f->fb_width) ||
-                    __put_user(fb_depth, &f->fb_depth) ||
-                    __put_user(0, &f->fb_cmsize) ||
-                    __put_user(fb_size, &f->fb_cmsize))
+                    put_user(info->var.yres, &f->fb_height) ||
+                    put_user(info->var.xres, &f->fb_width) ||
+                    put_user(fb_depth, &f->fb_depth) ||
+                    put_user(0, &f->fb_cmsize) ||
+                    put_user(fb_size, &f->fb_cmsize))
                         return -EFAULT;
                 return 0;
         }
@@ -125,10 +125,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
                 unsigned int index, count, i;
 
                 if (get_user(index, &c->index) ||
-                    __get_user(count, &c->count) ||
-                    __get_user(ured, &c->red) ||
-                    __get_user(ugreen, &c->green) ||
-                    __get_user(ublue, &c->blue))
+                    get_user(count, &c->count) ||
+                    get_user(ured, &c->red) ||
+                    get_user(ugreen, &c->green) ||
+                    get_user(ublue, &c->blue))
                         return -EFAULT;
 
                 cmap.len = 1;
@@ -165,10 +165,10 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg,
                 u8 red, green, blue;
 
                 if (get_user(index, &c->index) ||
-                    __get_user(count, &c->count) ||
-                    __get_user(ured, &c->red) ||
-                    __get_user(ugreen, &c->green) ||
-                    __get_user(ublue, &c->blue))
+                    get_user(count, &c->count) ||
+                    get_user(ured, &c->red) ||
+                    get_user(ugreen, &c->green) ||
+                    get_user(ublue, &c->blue))
                         return -EFAULT;
 
                 if (index + count > cmap->len)