Skip to content

Commit a10df49

Browse files
Jiri Slabygregkh
authored andcommitted
vt: vt_kern.h, remove extern from functions
Unify the declarations of functions in vt_kern.h: some are with extern, some are not. Remove extern from the former as it is not needed for functions. Signed-off-by: Jiri Slaby <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f400991 commit a10df49

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

include/linux/vt_kern.h

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
#define BROKEN_GRAPHICS_PROGRAMS 1
2929
#endif
3030

31-
extern void kd_mksound(unsigned int hz, unsigned int ticks);
32-
extern int kbd_rate(struct kbd_repeat *rep);
31+
void kd_mksound(unsigned int hz, unsigned int ticks);
32+
int kbd_rate(struct kbd_repeat *rep);
33+
3334
extern int fg_console, last_console, want_console;
3435

3536
/* console.c */
@@ -131,8 +132,8 @@ void vt_event_post(unsigned int event, unsigned int old, unsigned int new);
131132
int vt_waitactive(int n);
132133
void change_console(struct vc_data *new_vc);
133134
void reset_vc(struct vc_data *vc);
134-
extern int do_unbind_con_driver(const struct consw *csw, int first, int last,
135-
int deflt);
135+
int do_unbind_con_driver(const struct consw *csw, int first, int last,
136+
int deflt);
136137
int vty_init(const struct file_operations *console_fops);
137138

138139
extern bool vt_dont_switch;
@@ -146,7 +147,7 @@ struct vt_spawn_console {
146147
};
147148
extern struct vt_spawn_console vt_spawn_con;
148149

149-
extern int vt_move_to_console(unsigned int vt, int alloc);
150+
int vt_move_to_console(unsigned int vt, int alloc);
150151

151152
/* Interfaces for VC notification of character events (for accessibility etc) */
152153

@@ -155,35 +156,34 @@ struct vt_notifier_param {
155156
unsigned int c; /* Printed char */
156157
};
157158

158-
extern int register_vt_notifier(struct notifier_block *nb);
159-
extern int unregister_vt_notifier(struct notifier_block *nb);
159+
int register_vt_notifier(struct notifier_block *nb);
160+
int unregister_vt_notifier(struct notifier_block *nb);
160161

161-
extern void hide_boot_cursor(bool hide);
162+
void hide_boot_cursor(bool hide);
162163

163164
/* keyboard provided interfaces */
164-
extern int vt_do_diacrit(unsigned int cmd, void __user *up, int eperm);
165-
extern int vt_do_kdskbmode(int console, unsigned int arg);
166-
extern int vt_do_kdskbmeta(int console, unsigned int arg);
167-
extern int vt_do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc,
168-
int perm);
169-
extern int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe,
170-
int perm, int console);
171-
extern int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb,
172-
int perm);
173-
extern int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm);
174-
extern int vt_do_kdgkbmode(int console);
175-
extern int vt_do_kdgkbmeta(int console);
176-
extern void vt_reset_unicode(int console);
177-
extern int vt_get_shift_state(void);
178-
extern void vt_reset_keyboard(int console);
179-
extern int vt_get_leds(int console, int flag);
180-
extern int vt_get_kbd_mode_bit(int console, int bit);
181-
extern void vt_set_kbd_mode_bit(int console, int bit);
182-
extern void vt_clr_kbd_mode_bit(int console, int bit);
183-
extern void vt_set_led_state(int console, int leds);
184-
extern void vt_set_led_state(int console, int leds);
185-
extern void vt_kbd_con_start(int console);
186-
extern void vt_kbd_con_stop(int console);
165+
int vt_do_diacrit(unsigned int cmd, void __user *up, int eperm);
166+
int vt_do_kdskbmode(int console, unsigned int arg);
167+
int vt_do_kdskbmeta(int console, unsigned int arg);
168+
int vt_do_kbkeycode_ioctl(int cmd, struct kbkeycode __user *user_kbkc,
169+
int perm);
170+
int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
171+
int console);
172+
int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm);
173+
int vt_do_kdskled(int console, int cmd, unsigned long arg, int perm);
174+
int vt_do_kdgkbmode(int console);
175+
int vt_do_kdgkbmeta(int console);
176+
void vt_reset_unicode(int console);
177+
int vt_get_shift_state(void);
178+
void vt_reset_keyboard(int console);
179+
int vt_get_leds(int console, int flag);
180+
int vt_get_kbd_mode_bit(int console, int bit);
181+
void vt_set_kbd_mode_bit(int console, int bit);
182+
void vt_clr_kbd_mode_bit(int console, int bit);
183+
void vt_set_led_state(int console, int leds);
184+
void vt_set_led_state(int console, int leds);
185+
void vt_kbd_con_start(int console);
186+
void vt_kbd_con_stop(int console);
187187

188188
void vc_scrolldelta_helper(struct vc_data *c, int lines,
189189
unsigned int rolled_over, void *_base, unsigned int size);

0 commit comments

Comments
 (0)