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

Commit 709280da authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, consw->con_set_palette cleanup 



* allow NULL consw->con_set_palette (some consoles define an empty
  hook)
* => remove empty hooks now
* return value of consw->con_set_palette is never checked => make the
  function void
* document consw->con_set_palette 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 97293de9

drivers/tty/vt/vt.c

+1 −1
Original line number Diff line number Diff line
@@ -3978,7 +3978,7 @@ static void set_palette(struct vc_data *vc) 
{

	WARN_CONSOLE_UNLOCKED();



	if (vc->vc_mode != KD_GRAPHICS)

	if (vc->vc_mode != KD_GRAPHICS && vc->vc_sw->con_set_palette)

		vc->vc_sw->con_set_palette(vc, color_table);

}

drivers/usb/misc/sisusbvga/sisusb_con.c

+4 −7
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ sisusbcon_save_screen(struct vc_data *c) 
}



/* interface routine */

static int

static void

sisusbcon_set_palette(struct vc_data *c, const unsigned char *table)

{

	struct sisusb_usb_data *sisusb;
@@ -604,17 +604,17 @@ sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) 
	/* Return value not used by vt */



	if (!CON_IS_VISIBLE(c))

		return -EINVAL;

		return;



	sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num);

	if (!sisusb)

		return -EINVAL;

		return;



	/* sisusb->lock is down */



	if (sisusb_is_inactive(c, sisusb)) {

		mutex_unlock(&sisusb->lock);

		return -EINVAL;

		return;

	}



	for (i = j = 0; i < 16; i++) {
@@ -629,8 +629,6 @@ sisusbcon_set_palette(struct vc_data *c, const unsigned char *table) 
	}



	mutex_unlock(&sisusb->lock);



	return 0;

}



/* interface routine */
@@ -1428,7 +1426,6 @@ static const struct consw sisusb_dummy_con = { 
	.con_font_get =		SISUSBCONDUMMY,

	.con_font_default =	SISUSBCONDUMMY,

	.con_font_copy =	SISUSBCONDUMMY,

	.con_set_palette =	SISUSBCONDUMMY,

};



int

drivers/video/console/dummycon.c

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

    .con_font_default =	DUMMY,

    .con_font_copy =	DUMMY,

    .con_set_palette =	DUMMY,

};

EXPORT_SYMBOL_GPL(dummy_con);

drivers/video/console/fbcon.c

+5 −5
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx, 
			int height, int width);

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 void fbcon_set_palette(struct vc_data *vc, const unsigned char *table);



/*

 *  Internal routines
@@ -2651,17 +2651,17 @@ static struct fb_cmap palette_cmap = { 
	0, 16, palette_red, palette_green, palette_blue, NULL

};



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

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

{

	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];

	int i, j, k, depth;

	u8 val;



	if (fbcon_is_inactive(vc, info))

		return -EINVAL;

		return;



	if (!CON_IS_VISIBLE(vc))

		return 0;

		return;



	depth = fb_get_color_depth(&info->var, &info->fix);

	if (depth > 3) {
@@ -2683,7 +2683,7 @@ static int fbcon_set_palette(struct vc_data *vc, const unsigned char *table) 
	} else

		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);



	return fb_set_cmap(&palette_cmap, info);

	fb_set_cmap(&palette_cmap, info);

}



static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)

drivers/video/console/mdacon.c

+0 −6
Original line number Diff line number Diff line
@@ -481,11 +481,6 @@ static int mdacon_switch(struct vc_data *c) 
	return 1;	/* redrawing needed */

}



static int mdacon_set_palette(struct vc_data *c, const unsigned char *table)

{

	return -EINVAL;

}



static int mdacon_blank(struct vc_data *c, int blank, int mode_switch)

{

	if (mda_type == TYPE_MDA) {
@@ -572,7 +567,6 @@ static const struct consw mda_con = { 
	.con_bmove =		mdacon_bmove,

	.con_switch =		mdacon_switch,

	.con_blank =		mdacon_blank,

	.con_set_palette =	mdacon_set_palette,

	.con_build_attr =	mdacon_build_attr,

	.con_invert_region =	mdacon_invert_region,

};