[PATCH] fbcon: Sanitize fbcon

Do not pass the structure display since fbcon is already keeping the pointer
to the current display.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c
index cb25324a5635..153352ca9461 100644
--- a/drivers/video/console/tileblit.c
+++ b/drivers/video/console/tileblit.c
@@ -80,9 +80,8 @@ static void tile_clear_margins(struct vc_data *vc, struct fb_info *info,
         return;
 }
 
-static void tile_cursor(struct vc_data *vc, struct fb_info *info,
-                        struct display *p, int mode, int softback_lines,
-                        int fg, int bg)
+static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode,
+                        int softback_lines, int fg, int bg)
 {
         struct fb_tilecursor cursor;
         int use_sw = (vc->vc_cursor_type & 0x01);
@@ -130,10 +129,10 @@ static int tile_update_start(struct fb_info *info)
         return err;
 }
 
-void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
-                       struct display *p, struct fbcon_ops *ops)
+void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info)
 {
         struct fb_tilemap map;
+        struct fbcon_ops *ops = info->fbcon_par;
 
         ops->bmove = tile_bmove;
         ops->clear = tile_clear;
@@ -142,13 +141,13 @@ void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info,
         ops->cursor = tile_cursor;
         ops->update_start = tile_update_start;
 
-        if (p) {
+        if (ops->p) {
                 map.width = vc->vc_font.width;
                 map.height = vc->vc_font.height;
                 map.depth = 1;
-                map.length = (p->userfont) ?
-                        FNTCHARCNT(p->fontdata) : 256;
-                map.data = p->fontdata;
+                map.length = (ops->p->userfont) ?
+                        FNTCHARCNT(ops->p->fontdata) : 256;
+                map.data = ops->p->fontdata;
                 info->tileops->fb_settile(info, &map);
         }
 }