Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

17 files changed, 133 insertions, 191 deletions

diff --git a/drivers/sbus/audio/Config.in b/drivers/sbus/audio/Config.in
index b856f47d3..a9419f78c 100644
--- a/drivers/sbus/audio/Config.in
+++ b/drivers/sbus/audio/Config.in
@@ -4,6 +4,7 @@
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
 
+   mainmenu_option next_comment
    comment 'Linux/SPARC audio subsystem (EXPERIMENTAL)'
 
    tristate 'Audio support (EXPERIMENTAL)' CONFIG_SPARCAUDIO
@@ -11,4 +12,5 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    dep_tristate '  CS4231 Lowlevel Driver' CONFIG_SPARCAUDIO_CS4231 $CONFIG_SPARCAUDIO
    dep_tristate '  DBRI Lowlevel Driver' CONFIG_SPARCAUDIO_DBRI $CONFIG_SPARCAUDIO
    dep_tristate '  Dummy Lowlevel Driver' CONFIG_SPARCAUDIO_DUMMY $CONFIG_SPARCAUDIO
+   endmenu
 fi
diff --git a/drivers/sbus/audio/audio.c b/drivers/sbus/audio/audio.c
index 2d5dd31a1..62d295a8e 100644
--- a/drivers/sbus/audio/audio.c
+++ b/drivers/sbus/audio/audio.c
@@ -1,4 +1,4 @@
-/* $Id: audio.c,v 1.47 1999/12/15 22:30:16 davem Exp $
+/* $Id: audio.c,v 1.48 2000/02/09 22:33:19 davem Exp $
  * drivers/sbus/audio/audio.c
  *
  * Copyright 1996 Thomas K. Dyas (tdyas@noc.rutgers.edu)
@@ -1959,18 +1959,9 @@ static void sparcaudioctl_release(struct inode * inode, struct file * file)
 #endif
 
 static struct file_operations sparcaudioctl_fops = {
-        NULL,
-        NULL,
-        NULL,
-        NULL,                   /* sparcaudio_readdir */
-        sparcaudio_select,
-        sparcaudio_ioctl,
-        NULL,                   /* sparcaudio_mmap */
-        NULL,
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff
-        NULL,                   /* sparcaudio_flush */
-#endif
-        sparcaudioctl_release,
+	poll:		sparcaudio_select,
+	ioctl:		sparcaudio_ioctl,
+	release:	sparcaudioctl_release,
 };
 
 static int sparcaudio_open(struct inode * inode, struct file * file)
@@ -2170,18 +2161,13 @@ static void sparcaudio_release(struct inode * inode, struct file * file)
 #endif
 
 static struct file_operations sparcaudio_fops = {
-	sparcaudio_lseek,
-	sparcaudio_read,
-	sparcaudio_write,
-	NULL,			/* sparcaudio_readdir */
-	sparcaudio_select,
-	sparcaudio_ioctl,
-	NULL,			/* sparcaudio_mmap */
-	sparcaudio_open,
-#if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE > 0x200ff
-        NULL,                   /* sparcaudio_flush */
-#endif
-	sparcaudio_release
+	llseek:		sparcaudio_lseek,
+	read:		sparcaudio_read,
+	write:		sparcaudio_write,
+	poll:		sparcaudio_select,
+	ioctl:		sparcaudio_ioctl,
+	open:		sparcaudio_open,
+	release:	sparcaudio_release,
 };
 
 #if defined (LINUX_VERSION_CODE) && LINUX_VERSION_CODE < 0x20100
diff --git a/drivers/sbus/char/Config.in b/drivers/sbus/char/Config.in
index 556eeb238..f991b5cfa 100644
--- a/drivers/sbus/char/Config.in
+++ b/drivers/sbus/char/Config.in
@@ -1,3 +1,4 @@
+mainmenu_option next_comment
 comment 'Misc Linux/SPARC drivers'
 tristate '/dev/openprom device support' CONFIG_SUN_OPENPROMIO
 tristate 'Mostek real time clock support' CONFIG_SUN_MOSTEK_RTC
@@ -12,12 +13,16 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    tristate 'Bidirectional parallel port support (OBSOLETE)' CONFIG_SUN_BPP
    tristate 'Videopix Frame Grabber (EXPERIMENTAL)' CONFIG_SUN_VIDEOPIX
    tristate 'Aurora Multiboard 1600se (EXPERIMENTAL)' CONFIG_SUN_AURORA
-   tristate 'Tadpole TS102 Microcontroller support (EXPERIMENTAL)' CONFIG_TADPOLE_TS102_UCTRL
 
-   tristate 'JavaStation OS Flash SIMM (EXPERIMENTAL)' CONFIG_SUN_JSFLASH
-   # XXX Why don't we do "source drivers/char/Config.in" somewhere?
-   if [ "$CONFIG_PCI" = "y" ]; then
-      define_bool CONFIG_APM_RTC_IS_GMT y		# no shit
-      bool 'PC-style RTC' CONFIG_RTC
+   if [ "$ARCH" = "sparc" ]; then
+      tristate 'Tadpole TS102 Microcontroller support (EXPERIMENTAL)' CONFIG_TADPOLE_TS102_UCTRL
+
+      tristate 'JavaStation OS Flash SIMM (EXPERIMENTAL)' CONFIG_SUN_JSFLASH
+      # XXX Why don't we do "source drivers/char/Config.in" somewhere?
+      if [ "$CONFIG_PCI" = "y" ]; then
+	 define_bool CONFIG_APM_RTC_IS_GMT y		# no shit
+	 bool 'PC-style RTC' CONFIG_RTC
+      fi
    fi
 fi
+endmenu
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 45fbca714..1d2bee01a 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -834,19 +834,11 @@ static int bpp_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
 }
 
 static struct file_operations bpp_fops = {
-	NULL,		/* bpp_lseek */
-	bpp_read,
-	bpp_write,
-	NULL,		/* bpp_readdir */
-	NULL,		/* bpp_select */
-	bpp_ioctl,
-	NULL,		/* bpp_mmap */
-	bpp_open,
-	NULL,		/* flush */
-	bpp_release,
-  NULL,   /* fsync */
-  NULL,   /* fasync */
-  NULL,   /* lock */
+	read:		bpp_read,
+	write:		bpp_write,
+	ioctl:		bpp_ioctl,
+	open:		bpp_open,
+	release:	bpp_release,
 };
 
 #if defined(__i386__)
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 602c7b670..08acf4f81 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1,4 +1,4 @@
-/* $Id: envctrl.c,v 1.14 2000/01/09 15:43:45 ecd Exp $
+/* $Id: envctrl.c,v 1.15 2000/02/09 22:33:23 davem Exp $
  * envctrl.c: Temperature and Fan monitoring on Machines providing it.
  *
  * Copyright (C) 1998  Eddie C. Dost  (ecd@skynet.be)
@@ -1522,16 +1522,12 @@ envctrl_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations envctrl_fops = {
-	envctrl_llseek,
-	envctrl_read,
-	envctrl_write,
-	NULL,		/* readdir */
-	NULL,		/* poll */	
-	envctrl_ioctl,
-	NULL,		/* mmap */
-	envctrl_open,
-	NULL,		/* flush */
-	envctrl_release
+	llseek:		envctrl_llseek,
+	read:		envctrl_read,
+	write:		envctrl_write,
+	ioctl:		envctrl_ioctl,
+	open:		envctrl_open,
+	release:	envctrl_release,
 };
 
 static struct miscdevice envctrl_dev = {
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 9aee3418b..2e60789cf 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -1,4 +1,4 @@
-/* $Id: flash.c,v 1.15 1999/12/09 00:44:22 davem Exp $
+/* $Id: flash.c,v 1.17 2000/02/10 02:51:35 davem Exp $
  * flash.c: Allow mmap access to the OBP Flash, for OBP updates.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -128,18 +128,14 @@ flash_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations flash_fops = {
-	flash_llseek,
-	flash_read,
-	NULL,		/* no write to the Flash, use mmap
-			 * and play flash dependent tricks.
-			 */
-	NULL,		/* readdir */
-	NULL,		/* poll */
-	NULL,		/* ioctl */
-	flash_mmap,
-	flash_open,
-	NULL,		/* flush */
-	flash_release
+	/* no write to the Flash, use mmap
+	 * and play flash dependent tricks.
+	 */
+	llseek:		flash_llseek,
+	read:		flash_read,
+	mmap:		flash_mmap,
+	open:		flash_open,
+	release:	flash_release,
 };
 
 static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 14f074023..af9f6c95f 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -30,6 +30,7 @@
 #include <linux/fcntl.h>
 #include <linux/poll.h>
 #include <linux/init.h>
+#include <linux/string.h>
 #if 0	/* P3 from mem.c */
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
@@ -47,6 +48,8 @@
 #include <asm/sbus.h>
 #include <asm/ebus.h>
 #endif
+#include <asm/pcic.h>
+#include <asm/oplib.h>
 
 #include <asm/jsflash.h>		/* ioctl arguments. <linux/> ?? */
 #define JSFIDSZ		(sizeof(struct jsflash_ident_arg))
@@ -357,17 +360,13 @@ static int jsf_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations jsf_fops = {
-	jsf_lseek,
-	jsf_read,
-	jsf_write,
-	NULL,		/* readdir */
-	NULL,		/* poll */
-	jsf_ioctl,
-	jsf_mmap,
-	jsf_open,
-	NULL,		/* flush */
-	jsf_release,
-	NULL		/* fsync */
+	llseek:		jsf_lseek,
+	read:		jsf_read,
+	write:		jsf_write,
+	ioctl:		jsf_ioctl,
+	mmap:		jsf_mmap,
+	open:		jsf_open,
+	release:	jsf_release,
 };
 
 static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops };
@@ -377,10 +376,16 @@ EXPORT_NO_SYMBOLS;
 #ifdef MODULE
 int init_module(void)
 #else
-int /* __init */ jsflash_init(void)
+int __init jsflash_init(void)
 #endif
 {
 	int rc;
+	char banner[128];
+
+	/* FIXME: Really autodetect things */
+	prom_getproperty(prom_root_node, "banner-name", banner, 128);
+	if (strcmp (banner, "JavaStation-NC") && strcmp (banner, "JavaStation-E"))
+		return -ENXIO;
 
 	/* extern enum sparc_cpu sparc_cpu_model; */ /* in <asm/system.h> */
 	if (sparc_cpu_model == sun4m && jsf0.base == 0) {
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 78492a9da..8bba6512e 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -608,16 +608,10 @@ static int openprom_release(struct inode * inode, struct file * file)
 }
 
 static struct file_operations openprom_fops = {
-	openprom_lseek,
-	NULL,			/* openprom_read */
-	NULL,			/* openprom_write */
-	NULL,			/* openprom_readdir */
-	NULL,			/* openprom_poll */
-	openprom_ioctl,
-	NULL,			/* openprom_mmap */
-	openprom_open,
-	NULL,			/* flush */
-	openprom_release
+	llseek:		openprom_lseek,
+	ioctl:		openprom_ioctl,
+	open:		openprom_open,
+	release:	openprom_release,
 };
 
 static struct miscdevice openprom_dev = {
diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c
index 1c5846ade..97ebda430 100644
--- a/drivers/sbus/char/pcikbd.c
+++ b/drivers/sbus/char/pcikbd.c
@@ -1,4 +1,4 @@
-/* $Id: pcikbd.c,v 1.41 2000/01/08 07:01:20 davem Exp $
+/* $Id: pcikbd.c,v 1.43 2000/02/09 22:33:25 davem Exp $
  * pcikbd.c: Ultra/AX PC keyboard support.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -21,6 +21,7 @@
 #include <linux/random.h>
 #include <linux/miscdevice.h>
 #include <linux/kbd_ll.h>
+#include <linux/kbd_kern.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 
@@ -325,7 +326,7 @@ pcikbd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			handle_scancode(scancode, !(scancode & 0x80));
 		status = pcikbd_inb(pcikbd_iobase + KBD_STATUS_REG);
 	} while(status & KBD_STAT_OBF);
-	mark_bh(KEYBOARD_BH);
+	tasklet_schedule(&keyboard_tasklet);
 }
 
 static int send_data(unsigned char data)
@@ -713,12 +714,13 @@ static DECLARE_MUTEX(aux_sema4);
 static inline void aux_start_atomic(void)
 {
 	down(&aux_sema4);
-	disable_bh(KEYBOARD_BH);
+	tasklet_disable_nosync(&keyboard_tasklet);
+	tasklet_unlock_wait(&keyboard_tasklet);
 }
 
 static inline void aux_end_atomic(void)
 {
-	enable_bh(KEYBOARD_BH);
+	tasklet_enable(&keyboard_tasklet);
 	up(&aux_sema4);
 }
 
@@ -889,18 +891,12 @@ static unsigned int aux_poll(struct file *file, poll_table * wait)
 }
 
 struct file_operations psaux_fops = {
-	NULL,		/* seek */
-	aux_read,
-	aux_write,
-	NULL, 		/* readdir */
-	aux_poll,
-	NULL, 		/* ioctl */
-	NULL,		/* mmap */
-	aux_open,
-	NULL,		/* flush */
-	aux_release,
-	NULL,
-	aux_fasync,
+	read:		aux_read,
+	write:		aux_write,
+	poll:		aux_poll,
+	open:		aux_open,
+	release:	aux_release,
+	fasync:		aux_fasync,
 };
 
 static int aux_no_open(struct inode *inode, struct file *file)
@@ -909,14 +905,7 @@ static int aux_no_open(struct inode *inode, struct file *file)
 }
 
 struct file_operations psaux_no_fops = {
-	NULL,		/* seek */
-	NULL,
-	NULL,
-	NULL, 		/* readdir */
-	NULL,
-	NULL, 		/* ioctl */
-	NULL,		/* mmap */
-	aux_no_open,
+	open:		aux_no_open,
 };
 
 static struct miscdevice psaux_mouse = {
@@ -1035,6 +1024,9 @@ int __init ps2kbd_probe(void)
 		goto found;
 	}
 #endif
+	if (!pci_present())
+		goto do_enodev;
+
 	/*
 	 * Get the nodes for keyboard and mouse from aliases on normal systems.
 	 */
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 2a6f8624b..31f3596d5 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -1,4 +1,4 @@
-/* $Id: rtc.c,v 1.18 1999/08/31 18:51:36 davem Exp $
+/* $Id: rtc.c,v 1.19 2000/02/09 22:33:26 davem Exp $
  *
  * Linux/SPARC Real Time Clock Driver
  * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
@@ -137,16 +137,10 @@ static int rtc_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations rtc_fops = {
-	rtc_lseek,
-	NULL,		/* rtc_read */
-	NULL,		/* rtc_write */
-	NULL,		/* rtc_readdir */
-	NULL,		/* rtc_poll */
-	rtc_ioctl,
-	NULL,		/* rtc_mmap */
-	rtc_open,
-	NULL,		/* flush */
-	rtc_release
+	llseek:		rtc_lseek,
+	ioctl:		rtc_ioctl,
+	open:		rtc_open,
+	release:	rtc_release,
 };
 
 static struct miscdevice rtc_dev = { RTC_MINOR, "rtc", &rtc_fops };
diff --git a/drivers/sbus/char/su.c b/drivers/sbus/char/su.c
index 9c1e9f54f..6e30f9b58 100644
--- a/drivers/sbus/char/su.c
+++ b/drivers/sbus/char/su.c
@@ -1,4 +1,4 @@
-/* $Id: su.c,v 1.34 1999/12/02 09:55:21 davem Exp $
+/* $Id: su.c,v 1.36 2000/02/09 21:11:22 davem Exp $
  * su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -2223,7 +2223,7 @@ done:
  */
 static __inline__ void __init show_su_version(void)
 {
-	char *revision = "$Revision: 1.34 $";
+	char *revision = "$Revision: 1.36 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');
diff --git a/drivers/sbus/char/sunkbd.c b/drivers/sbus/char/sunkbd.c
index 6b7a893b7..7e26f3491 100644
--- a/drivers/sbus/char/sunkbd.c
+++ b/drivers/sbus/char/sunkbd.c
@@ -243,19 +243,13 @@ static unsigned char sunkbd_clickp;
 #define KEY_ALT         0x86
 #define KEY_L1          0x87
 
-/* Do to sun_kbd_init() being called before rs_init(), and sun_kbd_init() doing:
+/* Due to sun_kbd_init() being called before rs_init(), and sun_kbd_init() doing:
  *
- *	init_bh(KEYBOARD_BH, kbd_bh);
- *	mark_bh(KEYBOARD_BH);
+ *	tasklet_enable(&keyboard_tasklet);
+ *	tasklet_schedule(&keyboard_tasklet);
  *
  * this might well be called before some driver has claimed interest in
  * handling the keyboard input/output. So we need to assign an initial nop.
- *
- * Otherwise this would lead to the following (DaveM might want to look at):
- *
- *	sparc64_dtlb_refbit_catch(),
- *	do_sparc64_fault(),
- *	kernel NULL pointer dereference at do_sparc64_fault + 0x2c0 ;-(
  */
 static void nop_kbd_put_char(unsigned char c) { }
 static void (*kbd_put_char)(unsigned char) = nop_kbd_put_char;
@@ -460,6 +454,10 @@ keyboard_timer (unsigned long ignored)
 	restore_flags(flags);
 }
 
+#ifndef CONFIG_PCI
+DECLARE_TASKLET_DISABLED(keyboard_tasklet, sun_kbd_bh, 0);
+#endif
+
 /* #define SKBD_DEBUG */
 /* This is our keyboard 'interrupt' routine. */
 void sunkbd_inchar(unsigned char ch, struct pt_regs *regs)
@@ -610,7 +608,7 @@ void sunkbd_inchar(unsigned char ch, struct pt_regs *regs)
 		}
 	}
 out:
-	mark_bh(KEYBOARD_BH);
+	tasklet_schedule(&keyboard_tasklet);
 }
 
 static void put_queue(int ch)
@@ -1086,7 +1084,6 @@ static void do_lock(unsigned char value, char up_flag)
  */
 
 static unsigned char ledstate = 0xff; /* undefined */
-static unsigned char sunkbd_ledstate = 0xff; /* undefined */
 static unsigned char ledioctl;
 
 unsigned char sun_getledstate(void) {
@@ -1163,7 +1160,8 @@ static inline unsigned char getleds(void){
  * used, but this allows for easy and efficient race-condition
  * prevention later on.
  */
-static void kbd_bh(void)
+static unsigned char sunkbd_ledstate = 0xff; /* undefined */
+void sun_kbd_bh(unsigned long dummy)
 {
 	unsigned char leds = getleds();
 	unsigned char kbd_leds = vcleds_to_sunkbd(leds);
@@ -1247,8 +1245,12 @@ int __init sun_kbd_init(void)
 	} else {
 		sunkbd_clickp = 0;
 	}
-	init_bh(KEYBOARD_BH, kbd_bh);
-	mark_bh(KEYBOARD_BH);
+
+	keyboard_tasklet.func = sun_kbd_bh;
+
+	tasklet_enable(&keyboard_tasklet);
+	tasklet_schedule(&keyboard_tasklet);
+
 	return 0;
 }
 
@@ -1486,21 +1488,14 @@ kbd_close (struct inode *i, struct file *f)
 	return 0;
 }
 
-static struct
-file_operations kbd_fops =
+static struct file_operations kbd_fops =
 {
-	NULL,			/* seek */
-	kbd_read,		/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	kbd_poll,		/* poll */
-	kbd_ioctl,		/* ioctl */
-	NULL,			/* mmap */
-	kbd_open,		/* open */
-	NULL,			/* flush */
-	kbd_close,		/* close */
-	NULL,			/* fsync */
-	kbd_fasync,		/* fasync */
+	read:		kbd_read,
+	poll:		kbd_poll,
+	ioctl:		kbd_ioctl,
+	open:		kbd_open,
+	release:	kbd_close,
+	fasync:		kbd_fasync,
 };
 
 void __init keyboard_zsinit(void (*put_char)(unsigned char))
diff --git a/drivers/sbus/char/sunkbd.h b/drivers/sbus/char/sunkbd.h
index a1bfeb85b..1cf212902 100644
--- a/drivers/sbus/char/sunkbd.h
+++ b/drivers/sbus/char/sunkbd.h
@@ -1,4 +1,4 @@
-/* $Id: sunkbd.h,v 1.3 1997/09/08 03:05:10 tdyas Exp $
+/* $Id: sunkbd.h,v 1.4 2000/02/09 11:15:54 davem Exp $
  * sunkbd.h: Defines needed by SUN Keyboard drivers
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -26,6 +26,7 @@ extern void keyboard_zsinit(void (*kbd_put_char)(unsigned char));
 extern void sunkbd_inchar(unsigned char, struct pt_regs *);
 extern void batten_down_hatches(void);
 
+extern void sun_kbd_bh(unsigned long);
 extern int sun_kbd_init(void);
 extern void sun_compute_shiftstate(void);
 extern void sun_setledstate(struct kbd_struct *, unsigned int);
diff --git a/drivers/sbus/char/sunmouse.c b/drivers/sbus/char/sunmouse.c
index 2409d2e67..091702d15 100644
--- a/drivers/sbus/char/sunmouse.c
+++ b/drivers/sbus/char/sunmouse.c
@@ -542,18 +542,13 @@ sun_mouse_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsig
 }
 
 struct file_operations sun_mouse_fops = {
-	NULL,
-	sun_mouse_read,
-	sun_mouse_write,
-	NULL,
-	sun_mouse_poll,
-	sun_mouse_ioctl,
-	NULL,
-	sun_mouse_open,
-	NULL,		/* flush */
-	sun_mouse_close,
-	NULL,
-	sun_mouse_fasync,
+	read:		sun_mouse_read,
+	write:		sun_mouse_write,
+	poll:		sun_mouse_poll,
+	ioctl:		sun_mouse_ioctl,
+	open:		sun_mouse_open,
+	release:	sun_mouse_close,
+	fasync:		sun_mouse_fasync,
 };
 
 static struct miscdevice sun_mouse_mouse = {
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 6d9decaf3..78f45613d 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -1,4 +1,4 @@
-/* $Id: uctrl.c,v 1.6 2000/01/22 05:22:07 anton Exp $
+/* $Id: uctrl.c,v 1.7 2000/02/09 22:33:28 davem Exp $
  * uctrl.c: TS102 Microcontroller interface on Tadpole Sparcbook 3
  *
  * Copyright 1999 Derrick J Brashear (shadow@dementia.org)
@@ -238,16 +238,10 @@ void uctrl_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 static struct file_operations uctrl_fops = {
-	uctrl_llseek,
-	NULL,           /* read */
-	NULL,           /* write */
-	NULL,		/* readdir */
-	NULL,		/* poll */	
-	uctrl_ioctl,
-	NULL,		/* mmap */
-	uctrl_open,
-	NULL,		/* flush */
-	uctrl_release
+	llseek:		uctrl_llseek,
+	ioctl:		uctrl_ioctl,
+	open:		uctrl_open,
+	release:	uctrl_release,
 };
 
 static struct miscdevice uctrl_dev = {
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index 516e35617..5f7af8642 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -627,16 +627,11 @@ static int vfc_lseek(struct inode *inode, struct file *file,
 }
 
 static struct file_operations vfc_fops = {
-	vfc_lseek,   /* vfc_lseek */
-	NULL,        /* vfc_write */
-	NULL,        /* vfc_read */
-	NULL,        /* vfc_readdir */
-	NULL,        /* vfc_select */
-	vfc_ioctl,   
-	vfc_mmap, 
-	vfc_open,
-	NULL,	     /* flush */
-	vfc_release,
+	llseek:		vfc_lseek,
+	ioctl:		vfc_ioctl,
+	mmap:		vfc_mmap,
+	open:		vfc_open,
+	release:	vfc_release,
 };
 
 static int vfc_probe(void)
diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c
index 77f031cce..b08b73e18 100644
--- a/drivers/sbus/char/zs.c
+++ b/drivers/sbus/char/zs.c
@@ -1,4 +1,4 @@
-/* $Id: zs.c,v 1.53 2000/01/29 01:29:38 anton Exp $
+/* $Id: zs.c,v 1.55 2000/02/09 21:11:24 davem Exp $
  * zs.c: Zilog serial port driver for the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -1928,7 +1928,7 @@ int zs_open(struct tty_struct *tty, struct file * filp)
 
 static void show_serial_version(void)
 {
-	char *revision = "$Revision: 1.53 $";
+	char *revision = "$Revision: 1.55 $";
 	char *version, *p;
 
 	version = strchr(revision, ' ');