Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Use fnullop_fcntl instead of audiofcntl.



details:   https://anonhg.NetBSD.org/src/rev/23a6b9d92863
branches:  trunk
changeset: 821675:23a6b9d92863
user:      nat <nat%NetBSD.org@localhost>
date:      Mon Feb 13 01:59:14 2017 +0000

description:
Use fnullop_fcntl instead of audiofcntl.

diffstat:

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

diffs (49 lines):

diff -r 4a05383493f7 -r 23a6b9d92863 sys/dev/audio.c
--- a/sys/dev/audio.c   Sun Feb 12 22:37:49 2017 +0000
+++ b/sys/dev/audio.c   Mon Feb 13 01:59:14 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.303 2017/02/11 08:36:30 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 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.303 2017/02/11 08:36:30 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.304 2017/02/13 01:59:14 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -346,7 +346,6 @@
 int audiowrite(struct file *, off_t *, struct uio *, kauth_cred_t, int);
 int audioioctl(struct file *, u_long, void *);
 int audiopoll(struct file *, int);
-int audiofcntl(struct file *, u_int, void *);
 int audiokqfilter(struct file *, struct knote *);
 int audiostat(struct file *, struct stat *);
 
@@ -430,7 +429,7 @@
        .fo_read = audioread,
        .fo_write = audiowrite,
        .fo_ioctl = audioioctl,
-       .fo_fcntl = audiofcntl,
+       .fo_fcntl = fnullop_fcntl,
        .fo_stat = audiostat,
        .fo_poll = audiopoll,
        .fo_close = audioclose,
@@ -1741,13 +1740,6 @@
 }
 
 int
-audiofcntl(struct file *fp, u_int cmd, void *data)
-{
-
-       return EOPNOTSUPP;
-}
-
-int
 audiostat(struct file *fp, struct stat *st)
 {
        memset(st, 0, sizeof(*st));



Home | Main Index | Thread Index | Old Index