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

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
...@@ -156,7 +156,7 @@ static bool sticon_scroll(struct vc_data *conp, unsigned int t, ...@@ -156,7 +156,7 @@ static bool sticon_scroll(struct vc_data *conp, unsigned int t,
return false; 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 (font_data[unit] != STI_DEF_FONT) {
if (--FNTREFCOUNT(font_data[unit]) == 0) { if (--FNTREFCOUNT(font_data[unit]) == 0) {
...@@ -165,8 +165,6 @@ static int sticon_set_def_font(int unit, struct console_font *op) ...@@ -165,8 +165,6 @@ static int sticon_set_def_font(int unit, struct console_font *op)
} }
font_data[unit] = STI_DEF_FONT; font_data[unit] = STI_DEF_FONT;
} }
return 0;
} }
static int sticon_set_font(struct vc_data *vc, struct console_font *op, 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, ...@@ -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]); vc->vc_video_erase_char, font_data[vc->vc_num]);
/* delete old font in case it is a user font */ /* delete old font in case it is a user font */
sticon_set_def_font(unit, NULL); sticon_set_def_font(unit);
FNTREFCOUNT(cooked_font)++; FNTREFCOUNT(cooked_font)++;
font_data[unit] = cooked_font; font_data[unit] = cooked_font;
...@@ -264,7 +262,9 @@ static int sticon_set_font(struct vc_data *vc, struct console_font *op, ...@@ -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) 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, 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) ...@@ -297,7 +297,7 @@ static void sticon_deinit(struct vc_data *c)
/* free memory used by user font */ /* free memory used by user font */
for (i = 0; i < MAX_NR_CONSOLES; i++) 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, static void sticon_clear(struct vc_data *conp, int sy, int sx, int height,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment