patch-2.1.34 linux/drivers/sbus/char/sunkbd.c

• Lines: 36
• Date: Fri Apr 11 10:47:37 1997
• Orig file: v2.1.33/linux/drivers/sbus/char/sunkbd.c
• Orig date: Fri Apr 4 08:52:22 1997

diff -u --recursive --new-file v2.1.33/linux/drivers/sbus/char/sunkbd.c linux/drivers/sbus/char/sunkbd.c
@@ -383,7 +383,7 @@
 	    e0_keys[scancode - 128];
 }
 
-void sunkbd_inchar(unsigned char ch, unsigned char status, struct pt_regs *regs);
+void sunkbd_inchar(unsigned char ch, struct pt_regs *regs);
 static void keyboard_timer (unsigned long ignored);
 
 static struct timer_list
@@ -400,7 +400,7 @@
 	save_flags(flags); cli();
 
 	/* Auto repeat: send regs = 0 to indicate autorepeat */
-	sunkbd_inchar (last_keycode, 0, 0);
+	sunkbd_inchar (last_keycode, 0);
 	del_timer (&auto_repeat_timer);
 	if (kbd_rate_ticks) {
 		auto_repeat_timer.expires = jiffies + kbd_rate_ticks;
@@ -411,7 +411,7 @@
 
 /* #define SKBD_DEBUG */
 /* This is our keyboard 'interrupt' routine. */
-void sunkbd_inchar(unsigned char ch, unsigned char status, struct pt_regs *regs)
+void sunkbd_inchar(unsigned char ch, struct pt_regs *regs)
 {
 	unsigned char keycode;
 	char up_flag;                          /* 0 or SUNKBD_UBIT */
@@ -1393,7 +1393,7 @@
 kbd_close (struct inode *i, struct file *f)
 {
 	if (--kbd_active)
-		return;
+		return 0;
 
 	if (kbd_redirected)
 		kbd_table [kbd_opened-1].kbdmode = VC_XLATE;