Module Name: src
Committed By: nat
Date: Mon Feb 13 01:59:14 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Use fnullop_fcntl instead of audiofcntl.
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/sys/dev/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.303 src/sys/dev/audio.c:1.304
--- src/sys/dev/audio.c:1.303 Sat Feb 11 08:36:30 2017
+++ src/sys/dev/audio.c Mon Feb 13 01:59:14 2017
@@ -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 <[email protected]>
@@ -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 audioread(struct file *, off_t *, st
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 @@ const struct fileops audio_fileops = {
.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 @@ audioioctl(struct file *fp, u_long cmd,
}
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));
