Actually, 97 out of 304 devsw functions had benignly mismatched types.

5 files changed, 26 insertions, 27 deletions

diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 97225a8..8d0dc25 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -103,7 +103,7 @@ joyattach (struct isa_device *dev)
 }
 
 int
-joyopen (dev_t dev, int flag)
+joyopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
@@ -115,7 +115,7 @@ joyopen (dev_t dev, int flag)
     return 0;
 }
 int
-joyclose (dev_t dev, int flag)
+joyclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 97225a8..8d0dc25 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -103,7 +103,7 @@ joyattach (struct isa_device *dev)
 }
 
 int
-joyopen (dev_t dev, int flag)
+joyopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
@@ -115,7 +115,7 @@ joyopen (dev_t dev, int flag)
     return 0;
 }
 int
-joyclose (dev_t dev, int flag)
+joyclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 06c9f6f..9f1a196 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.27 1995/07/28 21:40:26 jkh Exp $
+ * $Id: soundcard.c,v 1.28 1995/09/01 19:09:11 jkh Exp $
  */
 
 #include "sound_config.h"
@@ -59,12 +59,12 @@ struct selinfo selinfo[SND_NDEVS >> 4];
 
 int             sndprobe (struct isa_device *dev);
 int             sndattach (struct isa_device *dev);
-int             sndopen (dev_t dev, int flags);
-int             sndclose (dev_t dev, int flags);
-int             sndioctl (dev_t dev, int cmd, caddr_t arg, int mode);
-int             sndread (int dev, struct uio *uio);
-int             sndwrite (int dev, struct uio *uio);
-int             sndselect (int dev, int rw, struct proc *p);
+int             sndopen (dev_t dev, int flags, int fmt, struct proc *p);
+int             sndclose (dev_t dev, int flags, int fmt, struct proc *p);
+int             sndioctl (dev_t dev, int cmd, caddr_t arg, int flags, struct proc *p);
+int             sndread (dev_t dev, struct uio *uio, int ioflag);
+int             sndwrite (dev_t dev, struct uio *uio, int ioflag);
+int             sndselect (dev_t dev, int rw, struct proc *p);
 static void	sound_mem_init(void);
 
 struct isa_driver opldriver	= {sndprobe, sndattach, "opl"};
@@ -119,7 +119,7 @@ int x;
  
 
 int
-sndread (int dev, struct uio *buf)
+sndread (dev_t dev, struct uio *buf, int ioflag)
 {
   int             count = buf->uio_resid;
 
@@ -129,7 +129,7 @@ sndread (int dev, struct uio *buf)
 }
 
 int
-sndwrite (int dev, struct uio *buf)
+sndwrite (dev_t dev, struct uio *buf, int ioflag)
 {
   int             count = buf->uio_resid;
 
@@ -139,7 +139,7 @@ sndwrite (int dev, struct uio *buf)
 }
 
 int
-sndopen (dev_t dev, int flags)
+sndopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
   int             retval;
 
@@ -167,7 +167,7 @@ sndopen (dev_t dev, int flags)
 }
 
 int
-sndclose (dev_t dev, int flags)
+sndclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
 
   dev = minor (dev);
@@ -177,7 +177,7 @@ sndclose (dev_t dev, int flags)
 }
 
 int
-sndioctl (dev_t dev, int cmd, caddr_t arg, int mode)
+sndioctl (dev_t dev, int cmd, caddr_t arg, int flags, struct proc *p)
 {
   dev = minor (dev);
 
@@ -185,7 +185,7 @@ sndioctl (dev_t dev, int cmd, caddr_t arg, int mode)
 }
 
 int
-sndselect (int dev, int rw, struct proc *p)
+sndselect (dev_t dev, int rw, struct proc *p)
 {
   dev = minor (dev);
 
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index ce4f0e0..f16ccdf 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -342,7 +342,7 @@ void wcd_describe (struct wcd *t)
 	printf ("\n");
 }
 
-int wcdopen (dev_t dev)
+int wcdopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int lun = UNIT(dev);
 	struct wcd *t;
@@ -413,7 +413,7 @@ int wcdopen (dev_t dev)
  * Close the device.  Only called if we are the LAST
  * occurence of an open device.
  */
-int wcdclose (dev_t dev)
+int wcdclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
 	int lun = UNIT(dev);
 	struct wcd *t = wcdtab[lun];
@@ -430,7 +430,7 @@ int wcdclose (dev_t dev)
  * understand. The transfer is described by a buf and will include only one
  * physical transfer.
  */
-int wcdstrategy (struct buf *bp)
+void wcdstrategy (struct buf *bp)
 {
 	int lun = UNIT(bp->b_dev);
 	struct wcd *t = wcdtab[lun];
@@ -442,7 +442,7 @@ int wcdstrategy (struct buf *bp)
 		bp->b_error = EIO;
 		bp->b_flags |= B_ERROR;
 		biodone (bp);
-		return (0);
+		return;
 	}
 
 	/* Can't ever write to a CD. */
@@ -450,14 +450,14 @@ int wcdstrategy (struct buf *bp)
 		bp->b_error = EROFS;
 		bp->b_flags |= B_ERROR;
 		biodone (bp);
-		return (0);
+		return;
 	}
 
 	/* If it's a null transfer, return immediatly. */
 	if (bp->b_bcount == 0) {
 		bp->b_resid = 0;
 		biodone (bp);
-		return (0);
+		return;
 	}
 
 	/* Process transfer request. */
@@ -472,7 +472,6 @@ int wcdstrategy (struct buf *bp)
 	 * not doing anything, otherwise just wait for completion. */
 	wcd_start (t);
 	splx(x);
-	return (0);
 }
 
 /*
@@ -600,7 +599,7 @@ static inline void lba2msf (int lba, u_char *m, u_char *s, u_char *f)
  * Perform special action on behalf of the user.
  * Knows about the internals of this device
  */
-int wcdioctl (dev_t dev, int cmd, caddr_t addr, int flag)
+int wcdioctl (dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
 {
 	int lun = UNIT(dev);
 	struct wcd *t = wcdtab[lun];
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index 97225a8..8d0dc25 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -103,7 +103,7 @@ joyattach (struct isa_device *dev)
 }
 
 int
-joyopen (dev_t dev, int flag)
+joyopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
@@ -115,7 +115,7 @@ joyopen (dev_t dev, int flag)
     return 0;
 }
 int
-joyclose (dev_t dev, int flag)
+joyclose (dev_t dev, int flags, int fmt, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);