Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a39bc34e authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] fbcon: Code cleanups 



- replace kmalloc with kzalloc
- remove repeated define (FONTCHHCNT)
- remove unneeded local variable (redraw) in ypan_{up|down}_redraw
- add and delete cursor timer in fbcon_switch() if old_info != info

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c5eec03f

drivers/video/console/fbcon.c

+11 −16
Original line number Diff line number Diff line
@@ -687,13 +687,12 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, 
		err = -ENODEV;



	if (!err) {

		ops = kmalloc(sizeof(struct fbcon_ops), GFP_KERNEL);

		ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL);

		if (!ops)

			err = -ENOMEM;

	}



	if (!err) {

		memset(ops, 0, sizeof(struct fbcon_ops));

		info->fbcon_par = ops;

		set_blitting_type(vc, info);

	}
@@ -919,13 +918,12 @@ static const char *fbcon_startup(void) 
		return NULL;

	}



	ops = kmalloc(sizeof(struct fbcon_ops), GFP_KERNEL);

	ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL);

	if (!ops) {

		module_put(owner);

		return NULL;

	}



	memset(ops, 0, sizeof(struct fbcon_ops));

	ops->currcon = -1;

	ops->graphics = 1;

	ops->cur_rotate = -1;
@@ -1408,16 +1406,13 @@ static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count) 
	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];

	struct fbcon_ops *ops = info->fbcon_par;

	struct display *p = &fb_display[vc->vc_num];

	int redraw = 0;



	p->yscroll += count;



	if (p->yscroll > p->vrows - vc->vc_rows) {

		p->yscroll -= p->vrows - vc->vc_rows;

		redraw = 1;

	}



	if (redraw)

		fbcon_redraw_move(vc, p, t + count, vc->vc_rows - count, t);

	}



	ops->var.xoffset = 0;

	ops->var.yoffset = p->yscroll * vc->vc_font.height;
@@ -1459,16 +1454,13 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count) 
	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];

	struct fbcon_ops *ops = info->fbcon_par;

	struct display *p = &fb_display[vc->vc_num];

	int redraw = 0;



	p->yscroll -= count;



	if (p->yscroll < 0) {

		p->yscroll += p->vrows - vc->vc_rows;

		redraw = 1;

	}



	if (redraw)

		fbcon_redraw_move(vc, p, t, vc->vc_rows - count, t + count);

	}



	ops->var.xoffset = 0;

	ops->var.yoffset = p->yscroll * vc->vc_font.height;
@@ -2105,9 +2097,12 @@ static int fbcon_switch(struct vc_data *vc) 
				 info->flags & FBINFO_MISC_ALWAYS_SETPAR)) {

		if (info->fbops->fb_set_par)

			info->fbops->fb_set_par(info);



		if (old_info != info) {

			fbcon_del_cursor_timer(old_info);

			fbcon_add_cursor_timer(info);

		}

	}



	set_blitting_type(vc, info);

	ops->cursor_reset = 1;

drivers/video/console/fbcon_rotate.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#ifndef _FBCON_ROTATE_H

#define _FBCON_ROTATE_H



#define FNTCHARCNT(fd)	(((int *)(fd))[-3])



#define GETVYRES(s,i) ({                           \

        (s == SCROLL_REDRAW || s == SCROLL_MOVE) ? \

        (i)->var.yres : (i)->var.yres_virtual; })