6 files changed, 26 insertions, 44 deletions

diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
index 4eef20790c3e..3c731577fed6 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -157,9 +157,9 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                                         src = buf;
                                 }
 
-                                fb_sysmove_buf_unaligned(info, &info->pixmap, dst, pitch,
-                                               src, idx, image.height,
-                                               shift_high, shift_low, mod);
+                                fb_pad_unaligned_buffer(dst, pitch, src, idx,
+                                                image.height, shift_high,
+                                                shift_low, mod);
                                 shift_low += mod;
                                 dst += (shift_low >= 8) ? width : width - 1;
                                 shift_low &= 7;
@@ -175,8 +175,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
                                         src = buf;
                                 }
 
-                                fb_sysmove_buf_aligned(info, &info->pixmap, dst, pitch,
-                                             src, idx, image.height);
+                                fb_pad_aligned_buffer(dst, pitch, src, idx, image.height);
                                 dst += width;
                         }
                 }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 78907a873493..6f871a8b9058 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -78,9 +78,7 @@ EXPORT_SYMBOL(fb_get_color_depth);
 /*
  * Data padding functions.
  */
-void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
-                            u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-                            u32 height)
+void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height)
 {
         int i;
 
@@ -90,12 +88,10 @@ void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
                 dst += d_pitch;
         }
 }
-EXPORT_SYMBOL(fb_sysmove_buf_aligned);
+EXPORT_SYMBOL(fb_pad_aligned_buffer);
 
-void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
-                              u8 *dst, u32 d_pitch, u8 *src, u32 idx,
-                              u32 height, u32 shift_high, u32 shift_low,
-                              u32 mod)
+void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx, u32 height,
+                                u32 shift_high, u32 shift_low, u32 mod)
 {
         u8 mask = (u8) (0xfff << shift_high), tmp;
         int i, j;
@@ -122,7 +118,7 @@ void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
                 dst += d_pitch;
         }
 }
-EXPORT_SYMBOL(fb_sysmove_buf_unaligned);
+EXPORT_SYMBOL(fb_pad_unaligned_buffer);
 
 /*
  * we need to lock this section since fb_cursor
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 47733f58153b..266ff5d7ac36 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -516,9 +516,9 @@ static struct backlight_controller nvidia_backlight_controller = {
 static void nvidiafb_load_cursor_image(struct nvidia_par *par, u8 * data8,
                                        u16 bg, u16 fg, u32 w, u32 h)
 {
+        u32 *data = (u32 *) data8;
         int i, j, k = 0;
         u32 b, tmp;
-        u32 *data = (u32 *) data8;
 
         w = (w + 1) & ~1;
 
@@ -890,11 +890,11 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         struct nvidia_par *par = info->par;
         u8 data[MAX_CURS * MAX_CURS / 8];
-        u16 fg, bg;
         int i, set = cursor->set;
+        u16 fg, bg;
 
         if (cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)
-                return soft_cursor(info, cursor);
+                return -ENXIO;
 
         NVShowHideCursor(par, 0);
 
@@ -931,21 +931,18 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 if (src) {
                         switch (cursor->rop) {
                         case ROP_XOR:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] ^ msk[i];
                                 break;
                         case ROP_COPY:
                         default:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] & msk[i];
                                 break;
                         }
 
-                        fb_sysmove_buf_aligned(info, &info->pixmap, data,
-                                               d_pitch, src, s_pitch,
-                                               cursor->image.height);
+                        fb_pad_aligned_buffer(data, d_pitch, src, s_pitch,
+                                                cursor->image.height);
 
                         bg = ((info->cmap.red[bg_idx] & 0xf8) << 7) |
                             ((info->cmap.green[bg_idx] & 0xf8) << 2) |
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index b0c886de0404..7540f60af948 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1582,12 +1582,11 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
         struct riva_par *par = (struct riva_par *) info->par;
         u8 data[MAX_CURS * MAX_CURS/8];
-        u16 fg, bg;
         int i, set = cursor->set;
+        u16 fg, bg;
 
-        if (cursor->image.width > MAX_CURS ||
-            cursor->image.height > MAX_CURS)
-                return soft_cursor(info, cursor);
+        if (cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)
+                return -ENXIO;
 
         par->riva.ShowHideCursor(&par->riva, 0);
 
@@ -1625,21 +1624,18 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
                 if (src) {
                         switch (cursor->rop) {
                         case ROP_XOR:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] ^ msk[i];
                                 break;
                         case ROP_COPY:
                         default:
-                                for (i = 0; i < s_pitch * cursor->image.height;
-                                     i++)
+                                for (i = 0; i < s_pitch * cursor->image.height; i++)
                                         src[i] = dat[i] & msk[i];
                                 break;
                         }
 
-                        fb_sysmove_buf_aligned(info, &info->pixmap, data,
-                                               d_pitch, src, s_pitch,
-                                               cursor->image.height);
+                        fb_pad_aligned_buffer(data, d_pitch, src, s_pitch,
+                                                cursor->image.height);
 
                         bg = ((info->cmap.red[bg_idx] & 0xf8) << 7) |
                                 ((info->cmap.green[bg_idx] & 0xf8) << 2) |
diff --git a/drivers/video/softcursor.c b/drivers/video/softcursor.c
index a6c5ca88d6b0..229c4bc35079 100644
--- a/drivers/video/softcursor.c
+++ b/drivers/video/softcursor.c
@@ -58,13 +58,10 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
         } else 
                 memcpy(src, image->data, dsize);
         
-        fb_sysmove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
-                                s_pitch, image->height);
-
+        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
         image->data = dst;
         info->fbops->fb_imageblit(info, image);
         kfree(src);
-
         return 0;
 }
 
diff --git a/include/linux/fb.h b/include/linux/fb.h
index e14942805dbd..bc24beeed971 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -816,12 +816,9 @@ extern int unregister_framebuffer(struct fb_info *fb_info);
 extern int fb_prepare_logo(struct fb_info *fb_info);
 extern int fb_show_logo(struct fb_info *fb_info);
 extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
-extern void fb_sysmove_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf,
-                                u8 *dst, u32 d_pitch, u8 *src, u32 idx,
+extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,
                                 u32 height, u32 shift_high, u32 shift_low, u32 mod);
-extern void fb_sysmove_buf_aligned(struct fb_info *info, struct fb_pixmap *buf,
-                                u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch,
-                                u32 height);
+extern void fb_pad_aligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 s_pitch, u32 height);
 extern void fb_set_suspend(struct fb_info *info, int state);
 extern int fb_get_color_depth(struct fb_var_screeninfo *var);
 extern int fb_get_options(char *name, char **option);