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

driver due to the Origin A64 hacks.

5 files changed, 33 insertions, 88 deletions

diff --git a/drivers/sgi/char/ds1286.c b/drivers/sgi/char/ds1286.c
index 3b9fa13e3..415fec386 100644
--- a/drivers/sgi/char/ds1286.c
+++ b/drivers/sgi/char/ds1286.c
@@ -1,4 +1,4 @@
-/* $Id: ds1286.c,v 1.5 1999/06/24 01:00:50 ulfc Exp $
+/* $Id: ds1286.c,v 1.6 1999/10/09 00:01:31 ralf Exp $
  *
  *	Real Time Clock interface for Linux	
  *
@@ -371,16 +371,12 @@ static unsigned int ds1286_poll(struct file *file, poll_table *wait)
  */
 
 static struct file_operations ds1286_fops = {
-	ds1286_llseek,
-	ds1286_read,
-	NULL,		/* No write */
-	NULL,		/* No readdir */
-	ds1286_poll,
-	ds1286_ioctl,
-	NULL,		/* No mmap */
-	ds1286_open,
-	NULL,
-	ds1286_release
+	llseek:		ds1286_llseek,
+	read:		ds1286_read,
+	poll:		ds1286_poll,
+	ioctl:		ds1286_ioctl,
+	open:		ds1286_open,
+	release:	ds1286_release,
 };
 
 static struct miscdevice ds1286_dev=
diff --git a/drivers/sgi/char/graphics.c b/drivers/sgi/char/graphics.c
index 9fe649b03..c11720087 100644
--- a/drivers/sgi/char/graphics.c
+++ b/drivers/sgi/char/graphics.c
@@ -1,4 +1,4 @@
-/* $Id: graphics.c,v 1.21 2000/02/05 06:47:30 ralf Exp $
+/* $Id: graphics.c,v 1.22 2000/02/18 00:24:43 ralf Exp $
  *
  * gfx.c: support for SGI's /dev/graphics, /dev/opengl
  *
@@ -287,18 +287,10 @@ graphics_ops_post_init (int slot)
 #endif
 
 struct file_operations sgi_graphics_fops = {
-	NULL,			/* llseek */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	NULL,			/* poll */
-	sgi_graphics_ioctl,	/* ioctl */
-	sgi_graphics_mmap,	/* mmap */
-	sgi_graphics_open,	/* open */
-	NULL,			/* flush */
-	sgi_graphics_close,	/* release */
-	NULL,			/* fsync */
-	NULL			/* lock */
+	ioctl:		sgi_graphics_ioctl,
+	mmap:		sgi_graphics_mmap,
+	open:		sgi_graphics_open,
+	release:	sgi_graphics_close,
 };
 
 /* /dev/graphics */
diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c
index 153df30be..c4f707598 100644
--- a/drivers/sgi/char/shmiq.c
+++ b/drivers/sgi/char/shmiq.c
@@ -1,4 +1,4 @@
-/* $Id: shmiq.c,v 1.17 2000/02/05 06:47:30 ralf Exp $
+/* $Id: shmiq.c,v 1.18 2000/02/18 00:24:43 ralf Exp $
  *
  * shmiq.c: shared memory input queue driver
  * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -429,21 +429,14 @@ shmiq_qcntl_close (struct inode *inode, struct file *filp)
 }
 
 
-static struct
-file_operations shmiq_fops =
+static struct file_operations shmiq_fops =
 {
-        NULL,                   /* seek */
-        NULL,                   /* read */
-        NULL,                   /* write */
-        NULL,                   /* readdir */
-        shmiq_qcntl_poll,       /* poll */
-        shmiq_qcntl_ioctl,      /* ioctl */
-        shmiq_qcntl_mmap,       /* mmap */
-        shmiq_qcntl_open,       /* open */
-	NULL,			/* flush */
-        shmiq_qcntl_close,      /* close */
-        NULL,                   /* fsync */
-        shmiq_qcntl_fasync,     /* fasync */
+	poll:		shmiq_qcntl_poll,
+	ioctl:		shmiq_qcntl_ioctl,
+	mmap:		shmiq_qcntl_mmap,
+	open:		shmiq_qcntl_open,
+	release:	shmiq_qcntl_close,
+	fasync:		shmiq_qcntl_fasync,
 };
 
 void
diff --git a/drivers/sgi/char/streamable.c b/drivers/sgi/char/streamable.c
index d367e7932..b07bedece 100644
--- a/drivers/sgi/char/streamable.c
+++ b/drivers/sgi/char/streamable.c
@@ -1,4 +1,4 @@
-/* $Id: streamable.c,v 1.9 1998/09/19 19:17:50 ralf Exp $
+/* $Id: streamable.c,v 1.10 2000/02/05 06:47:30 ralf Exp $
  *
  * streamable.c: streamable devices. /dev/gfx
  * (C) 1997 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -72,18 +72,9 @@ sgi_gfx_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigne
 }
 
 struct file_operations sgi_gfx_fops = {
-	NULL,			/* llseek */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	NULL,			/* poll */
-	sgi_gfx_ioctl,		/* ioctl */
-	NULL,			/* mmap */
-	sgi_gfx_open,		/* open */
-	NULL,			/* flush */
-	sgi_gfx_close,		/* release */
-	NULL,			/* fsync */
-	NULL			/* lock */
+	ioctl:		sgi_gfx_ioctl,
+	open:		sgi_gfx_open,
+	release:	sgi_gfx_close,
 };
  
 static struct miscdevice dev_gfx = {
@@ -191,18 +182,8 @@ sgi_keyb_open (struct inode *inode, struct file *file)
 }
 
 struct file_operations sgi_keyb_fops = {
-	NULL,			/* llseek */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	NULL,			/* poll */
-	sgi_keyb_ioctl,		/* ioctl */
-	NULL,			/* mmap */
-	sgi_keyb_open,		/* open */
-	NULL,			/* flush */
-	NULL,			/* release */
-	NULL,			/* fsync */
-	NULL			/* lock */
+	ioctl:		sgi_keyb_ioctl,
+	open:		sgi_keyb_open,
 };
 
 static struct miscdevice dev_input_keyboard = {
@@ -330,18 +311,9 @@ sgi_mouse_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsig
 }
 
 struct file_operations sgi_mouse_fops = {
-	NULL,			/* llseek */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	NULL,			/* poll */
-	sgi_mouse_ioctl,	/* ioctl */
-	NULL,			/* mmap */
-	sgi_mouse_open,		/* open */
-	NULL,			/* flush */
-	sgi_mouse_close,	/* release */
-	NULL,			/* fsync */
-	NULL			/* lock */
+	ioctl:		sgi_mouse_ioctl,
+	open:		sgi_mouse_open,
+	release:	sgi_mouse_close,
 };
 
 /* /dev/input/mouse */
diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c
index 329810322..9ab379ed1 100644
--- a/drivers/sgi/char/usema.c
+++ b/drivers/sgi/char/usema.c
@@ -170,18 +170,10 @@ sgi_usemaclone_release(struct inode *inode, struct file *filp)
 }
 
 struct file_operations sgi_usemaclone_fops = {
-	NULL,			/* llseek */
-	NULL,			/* read */
-	NULL,			/* write */
-	NULL,			/* readdir */
-	sgi_usemaclone_poll,	/* poll */
-	sgi_usemaclone_ioctl,	/* ioctl */
-	NULL,			/* mmap */
-	sgi_usemaclone_open,	/* open */
-	NULL,			/* flush */
-	sgi_usemaclone_release,	/* release */
-	NULL,			/* fsync */
-	NULL			/* lock */
+	poll:		sgi_usemaclone_poll,
+	ioctl:		sgi_usemaclone_ioctl,
+	open:		sgi_usemaclone_open,
+	release:	sgi_usemaclone_release,
 };
 
 static struct miscdevice dev_usemaclone = {