tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: "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: Helge Deller <deller@gmx.de>

authored by

Jiri Slaby (SUSE) and committed by
Helge Deller 4f2ba39a 1023ca19

+6 -6
+6 -6
drivers/video/console/sticon.c
··· 156 156 return false; 157 157 } 158 158 159 - static int sticon_set_def_font(int unit, struct console_font *op) 159 + static void sticon_set_def_font(int unit) 160 160 { 161 161 if (font_data[unit] != STI_DEF_FONT) { 162 162 if (--FNTREFCOUNT(font_data[unit]) == 0) { ··· 165 165 } 166 166 font_data[unit] = STI_DEF_FONT; 167 167 } 168 - 169 - return 0; 170 168 } 171 169 172 170 static int sticon_set_font(struct vc_data *vc, struct console_font *op, ··· 244 246 vc->vc_video_erase_char, font_data[vc->vc_num]); 245 247 246 248 /* delete old font in case it is a user font */ 247 - sticon_set_def_font(unit, NULL); 249 + sticon_set_def_font(unit); 248 250 249 251 FNTREFCOUNT(cooked_font)++; 250 252 font_data[unit] = cooked_font; ··· 262 264 263 265 static int sticon_font_default(struct vc_data *vc, struct console_font *op, char *name) 264 266 { 265 - return sticon_set_def_font(vc->vc_num, op); 267 + sticon_set_def_font(vc->vc_num); 268 + 269 + return 0; 266 270 } 267 271 268 272 static int sticon_font_set(struct vc_data *vc, struct console_font *font, ··· 297 297 298 298 /* free memory used by user font */ 299 299 for (i = 0; i < MAX_NR_CONSOLES; i++) 300 - sticon_set_def_font(i, NULL); 300 + sticon_set_def_font(i); 301 301 } 302 302 303 303 static void sticon_clear(struct vc_data *conp, int sy, int sx, int height,