[src/trunk]: src/sys/dev Revert FNONBLOCK logic to that from rev 1.335.

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d93f7eddb19
branches:  trunk
changeset: 353556:1d93f7eddb19
user:      nat <nat%NetBSD.org@localhost>
date:      Thu May 11 23:20:38 2017 +0000

description:
Revert FNONBLOCK logic to that from rev 1.335.

Ok riastradh@.

diffstat:

 sys/dev/audio.c |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r cc7dd96ff089 -r 1d93f7eddb19 sys/dev/audio.c
--- a/sys/dev/audio.c   Thu May 11 22:38:56 2017 +0000
+++ b/sys/dev/audio.c   Thu May 11 23:20:38 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.337 2017/05/08 07:31:34 martin Exp $       */
+/*     $NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.337 2017/05/08 07:31:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.338 2017/05/11 23:20:38 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1690,18 +1690,17 @@
 
 static int
 audioread(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
-         int flags)
+         int ioflag)
 {
        struct audio_softc *sc;
        struct virtual_channel *vc;
-       int error, ioflag;
+       int error;
        dev_t dev;
 
        if (fp->f_audioctx == NULL)
                return EIO;
 
        dev = fp->f_audioctx->dev;
-       ioflag = 0;
 
        if ((error = audio_enter(dev, RW_READER, &sc)) != 0)
                return error;
@@ -1730,18 +1729,17 @@
 
 static int
 audiowrite(struct file *fp, off_t *offp, struct uio *uio, kauth_cred_t cred,
-          int flags)
+          int ioflag)
 {
        struct audio_softc *sc;
        struct virtual_channel *vc;
-       int error, ioflag;
+       int error;
        dev_t dev;
 
        if (fp->f_audioctx == NULL)
                return EIO;
 
        dev = fp->f_audioctx->dev;
-       ioflag = 0;
 
        if ((error = audio_enter(dev, RW_READER, &sc)) != 0)
                return error;