From ca519b12f7a49e18b7675790700fe7715b6ab6a5 Mon Sep 17 00:00:00 2001 From: kn Date: Wed, 19 Oct 2022 15:34:02 +0000 Subject: [PATCH] Remove audio(9) setfd() stub necsb(4/luna88k) is the only driver that "implements" it... through EIO. Remove it so setfd can be removed from struct audio_hw_if. Prodded by ratchov OK aoyama --- sys/arch/luna88k/cbus/nec86.c | 3 +-- sys/arch/luna88k/cbus/nec86hw.c | 11 +---------- sys/arch/luna88k/cbus/nec86hwvar.h | 4 +--- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/sys/arch/luna88k/cbus/nec86.c b/sys/arch/luna88k/cbus/nec86.c index eec75a8f4ac..4eb61f1cdc0 100644 --- a/sys/arch/luna88k/cbus/nec86.c +++ b/sys/arch/luna88k/cbus/nec86.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nec86.c,v 1.5 2022/03/21 19:22:39 miod Exp $ */ +/* $OpenBSD: nec86.c,v 1.6 2022/10/19 15:34:02 kn Exp $ */ /* $NecBSD: nec86.c,v 1.11 1999/07/23 11:04:39 honda Exp $ */ /* $NetBSD$ */ @@ -80,7 +80,6 @@ const struct audio_hw_if nec86_hw_if = { .halt_output = nec86hw_halt_pdma, .halt_input = nec86hw_halt_pdma, .speaker_ctl = nec86hw_speaker_ctl, - .setfd = nec86hw_setfd, .set_port = nec86hw_mixer_set_port, .get_port = nec86hw_mixer_get_port, .query_devinfo = nec86hw_mixer_query_devinfo, diff --git a/sys/arch/luna88k/cbus/nec86hw.c b/sys/arch/luna88k/cbus/nec86hw.c index 56c0c6130e3..a49987966c8 100644 --- a/sys/arch/luna88k/cbus/nec86hw.c +++ b/sys/arch/luna88k/cbus/nec86hw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nec86hw.c,v 1.6 2021/03/11 11:16:58 jsg Exp $ */ +/* $OpenBSD: nec86hw.c,v 1.7 2022/10/19 15:34:02 kn Exp $ */ /* $NecBSD: nec86hw.c,v 1.13 1998/03/14 07:04:54 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -328,15 +328,6 @@ nec86hw_commit_settings(void *addr) return 0; } -int -nec86hw_setfd(void *addr, int flag) -{ - DPRINTF(("nec86hw_setfd:\n")); - - /* Can't do full-duplex */ - return ENOTTY; -} - int nec86hw_mixer_set_port(void *addr, mixer_ctrl_t *cp) { diff --git a/sys/arch/luna88k/cbus/nec86hwvar.h b/sys/arch/luna88k/cbus/nec86hwvar.h index d0c4f4c1a11..45749c74858 100644 --- a/sys/arch/luna88k/cbus/nec86hwvar.h +++ b/sys/arch/luna88k/cbus/nec86hwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nec86hwvar.h,v 1.3 2016/09/19 06:46:43 ratchov Exp $ */ +/* $OpenBSD: nec86hwvar.h,v 1.4 2022/10/19 15:34:02 kn Exp $ */ /* $NecBSD: nec86hwvar.h,v 1.10 1998/03/14 07:04:55 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -153,8 +153,6 @@ int nec86hw_get_in_port(void *); int nec86hw_commit_settings(void *); -int nec86hw_setfd(void *, int); - int nec86hw_mixer_set_port(void *, mixer_ctrl_t *); int nec86hw_mixer_get_port(void *, mixer_ctrl_t *); int nec86hw_mixer_query_devinfo(void *, mixer_devinfo_t *); -- 2.20.1