Commit 4f2ba39a authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Helge Deller
Browse files

sticon: make sticon_set_def_font() void and remove op parameter 



sticon_set_def_font() always returns 0, so make it void. And remove an
unused 'op' parameter.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 1023ca19

drivers/video/console/sticon.c

+6 −6
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static bool sticon_scroll(struct vc_data *conp, unsigned int t, 
    return false;

}



static int sticon_set_def_font(int unit, struct console_font *op)

static void sticon_set_def_font(int unit)

{

	if (font_data[unit] != STI_DEF_FONT) {

		if (--FNTREFCOUNT(font_data[unit]) == 0) {
@@ -165,8 +165,6 @@ static int sticon_set_def_font(int unit, struct console_font *op) 
		}

		font_data[unit] = STI_DEF_FONT;

	}



	return 0;

}



static int sticon_set_font(struct vc_data *vc, struct console_font *op,
@@ -246,7 +244,7 @@ static int sticon_set_font(struct vc_data *vc, struct console_font *op, 
		  vc->vc_video_erase_char, font_data[vc->vc_num]);



	/* delete old font in case it is a user font */

	sticon_set_def_font(unit, NULL);

	sticon_set_def_font(unit);



	FNTREFCOUNT(cooked_font)++;

	font_data[unit] = cooked_font;
@@ -264,7 +262,9 @@ static int sticon_set_font(struct vc_data *vc, struct console_font *op, 


static int sticon_font_default(struct vc_data *vc, struct console_font *op, char *name)

{

	return sticon_set_def_font(vc->vc_num, op);

	sticon_set_def_font(vc->vc_num);



	return 0;

}



static int sticon_font_set(struct vc_data *vc, struct console_font *font,
@@ -297,7 +297,7 @@ static void sticon_deinit(struct vc_data *c) 


    /* free memory used by user font */

    for (i = 0; i < MAX_NR_CONSOLES; i++)

	sticon_set_def_font(i, NULL);

	sticon_set_def_font(i);

}



static void sticon_clear(struct vc_data *conp, int sy, int sx, int height,