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

Commit 97293de9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, consw->con_scrolldelta cleanup 



* allow NULL consw->con_scrolldelta (some consoles define an empty
  hook)
* => remove empty hooks now
* return value of consw->con_scrolldelta is never checked => make the
  function void
* document consw->con_scrolldelta a bit

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: linux-usb@vger.kernel.org
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3cc5be77

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -2468,7 +2468,7 @@ static void console_callback(struct work_struct *ignored) 
	if (scrollback_delta) {

		struct vc_data *vc = vc_cons[fg_console].d;

		clear_selection();

		if (vc->vc_mode == KD_TEXT)

		if (vc->vc_mode == KD_TEXT && vc->vc_sw->con_scrolldelta)

			vc->vc_sw->con_scrolldelta(vc, scrollback_delta);

		scrollback_delta = 0;

	}

drivers/usb/misc/sisusbvga/sisusb_con.c

+3 −8
Original line number Diff line number Diff line
@@ -717,24 +717,22 @@ sisusbcon_blank(struct vc_data *c, int blank, int mode_switch) 
}



/* interface routine */

static int

static void

sisusbcon_scrolldelta(struct vc_data *c, int lines)

{

	struct sisusb_usb_data *sisusb;

	int margin = c->vc_size_row * 4;

	int ul, we, p, st;



	/* The return value does not seem to be used */



	sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num);

	if (!sisusb)

		return 0;

		return;



	/* sisusb->lock is down */



	if (sisusb_is_inactive(c, sisusb)) {

		mutex_unlock(&sisusb->lock);

		return 0;

		return;

	}



	if (!lines)		/* Turn scrollback off */
@@ -774,8 +772,6 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines) 
	sisusbcon_set_start_address(sisusb, c);



	mutex_unlock(&sisusb->lock);



	return 1;

}



/* Interface routine */
@@ -1433,7 +1429,6 @@ static const struct consw sisusb_dummy_con = { 
	.con_font_default =	SISUSBCONDUMMY,

	.con_font_copy =	SISUSBCONDUMMY,

	.con_set_palette =	SISUSBCONDUMMY,

	.con_scrolldelta =	SISUSBCONDUMMY,

};



int

drivers/video/console/dummycon.c

+0 −1
Original line number Diff line number Diff line
@@ -72,6 +72,5 @@ const struct consw dummy_con = { 
    .con_font_default =	DUMMY,

    .con_font_copy =	DUMMY,

    .con_set_palette =	DUMMY,

    .con_scrolldelta =	DUMMY,

};

EXPORT_SYMBOL_GPL(dummy_con);

drivers/video/console/fbcon.c

+7 −9
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx, 
static int fbcon_switch(struct vc_data *vc);

static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch);

static int fbcon_set_palette(struct vc_data *vc, const unsigned char *table);

static int fbcon_scrolldelta(struct vc_data *vc, int lines);



/*

 *  Internal routines
@@ -2765,7 +2764,7 @@ static void fbcon_invert_region(struct vc_data *vc, u16 * p, int cnt) 
	}

}



static int fbcon_scrolldelta(struct vc_data *vc, int lines)

static void fbcon_scrolldelta(struct vc_data *vc, int lines)

{

	struct fb_info *info = registered_fb[con2fb_map[fg_console]];

	struct fbcon_ops *ops = info->fbcon_par;
@@ -2774,9 +2773,9 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines) 


	if (softback_top) {

		if (vc->vc_num != fg_console)

			return 0;

			return;

		if (vc->vc_mode != KD_TEXT || !lines)

			return 0;

			return;

		if (logo_shown >= 0) {

			struct vc_data *conp2 = vc_cons[logo_shown].d;
@@ -2809,11 +2808,11 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines) 
		fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK);

		fbcon_redraw_softback(vc, disp, lines);

		fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK);

		return 0;

		return;

	}



	if (!scrollback_phys_max)

		return -ENOSYS;

		return;



	scrollback_old = scrollback_current;

	scrollback_current -= lines;
@@ -2822,10 +2821,10 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines) 
	else if (scrollback_current > scrollback_max)

		scrollback_current = scrollback_max;

	if (scrollback_current == scrollback_old)

		return 0;

		return;



	if (fbcon_is_inactive(vc, info))

		return 0;

		return;



	fbcon_cursor(vc, CM_ERASE);
@@ -2852,7 +2851,6 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines) 


	if (!scrollback_current)

		fbcon_cursor(vc, CM_DRAW);

	return 0;

}



static int fbcon_set_origin(struct vc_data *vc)

drivers/video/console/mdacon.c

+0 −6
Original line number Diff line number Diff line
@@ -505,11 +505,6 @@ static int mdacon_blank(struct vc_data *c, int blank, int mode_switch) 
	}

}



static int mdacon_scrolldelta(struct vc_data *c, int lines)

{

	return 0;

}



static void mdacon_cursor(struct vc_data *c, int mode)

{

	if (mode == CM_ERASE) {
@@ -578,7 +573,6 @@ static const struct consw mda_con = { 
	.con_switch =		mdacon_switch,

	.con_blank =		mdacon_blank,

	.con_set_palette =	mdacon_set_palette,

	.con_scrolldelta =	mdacon_scrolldelta,

	.con_build_attr =	mdacon_build_attr,

	.con_invert_region =	mdacon_invert_region,

};