Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196840/?format=api
{ "id": 2196840, "url": "http://patchwork.ozlabs.org/api/patches/2196840/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-55-e676662e4514@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260216-audio-v1-55-e676662e4514@redhat.com>", "list_archive_url": null, "date": "2026-02-16T11:15:44", "name": "[55/85] audio: remove audio_driver init/fini/next", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6173f395bed8d59abd1b23b2dce5f5daf49481be", "submitter": { "id": 66774, "url": "http://patchwork.ozlabs.org/api/people/66774/?format=api", "name": "Marc-André Lureau", "email": "marcandre.lureau@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260216-audio-v1-55-e676662e4514@redhat.com/mbox/", "series": [ { "id": 492294, "url": "http://patchwork.ozlabs.org/api/series/492294/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=492294", "date": "2026-02-16T11:14:52", "name": "audio: cleanups & add a manual test", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492294/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196840/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196840/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Ak8NP4dg;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fF0ls0HSBz1xxp\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 22:24:09 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vrwfH-0005VF-2a; Mon, 16 Feb 2026 06:21:19 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1vrwcP-0006kl-43\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:25 -0500", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1vrwcL-0008Do-Ls\n for qemu-devel@nongnu.org; Mon, 16 Feb 2026 06:18:19 -0500", "from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-73-6ADIR1OIO3WEdeOi6R8n5A-1; Mon,\n 16 Feb 2026 06:18:14 -0500", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 961FF1955F15; Mon, 16 Feb 2026 11:18:12 +0000 (UTC)", "from localhost (unknown [10.45.242.26])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 3186218004BB; Mon, 16 Feb 2026 11:18:10 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771240696;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=b886deA9Pvd1EJ7wX/pK/rJb46L4AzeC6UVFBZkrEdc=;\n b=Ak8NP4dgdfYJFiIfQ1CtkCmaHk1IdrGGxkfqFXxZFNnzj6w/2vZpO6dF30RBhpneaxdFRE\n PJVHIr7Oo5pxUN41t66t4yonCGStZyMs++ZfGZk5zqtqdEpJGvBpjzrujQdGmUCJvSt9Ud\n O8qSDngLOT8nRqRCVLRCECi50GFjjfM=", "X-MC-Unique": "6ADIR1OIO3WEdeOi6R8n5A-1", "X-Mimecast-MFC-AGG-ID": "6ADIR1OIO3WEdeOi6R8n5A_1771240692", "From": "=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>", "Date": "Mon, 16 Feb 2026 12:15:44 +0100", "Subject": "[PATCH 55/85] audio: remove audio_driver init/fini/next", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Message-Id": "<20260216-audio-v1-55-e676662e4514@redhat.com>", "References": "<20260216-audio-v1-0-e676662e4514@redhat.com>", "In-Reply-To": "<20260216-audio-v1-0-e676662e4514@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "Gerd Hoffmann <kraxel@redhat.com>, Eduardo Habkost <eduardo@habkost.net>,\n Paolo Bonzini <pbonzini@redhat.com>,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>, =?utf-8?q?Phil?=\n\t=?utf-8?q?ippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>,\n Christian Schoenebeck <qemu_oss@crudebyte.com>,\n Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>,\n Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,\n Laurent Vivier <laurent@vivier.eu>, \"Michael S. Tsirkin\" <mst@redhat.com>,\n Manos Pitsidianakis <manos.pitsidianakis@linaro.org>,\n Alistair Francis <alistair@alistair23.me>,\n \"Edgar E. Iglesias\" <edgar.iglesias@gmail.com>,\n Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org, =?utf-8?q?M?=\n\t=?utf-8?q?arc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Mark Cave-Ayland <mark.caveayland@nutanix.com>", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=13684;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=hPnyFV3/nDK/Z8DsYQddyB9yVVLc1fypYo+VfCTLDXc=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBpkvxQe9sVZrsT+zOjUEMr/Kr2b6zsaHQuISnNM\n 4pRvJbtGx+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCaZL8UAAKCRDa6OEJdZac\n 5cVIEACHuwa865kfZWYsezVudKlm4Q/dPWx8MUY6qT+b/kQto7PYUKQE2l84tiQkMO3iElWaJoc\n CTuPWGvACSTEENgowE4cffIb1yiDRAF4DPWMe/GmQ9ZfrZ2JxUv5BaGHmECNNaCTmeIeHq3oUZS\n a0Mz48O7lqR+OhlzXJO9XiozEy/uM0PlQVIB/nd08ZH0w7Frqp3brIxdXTElpzJVi9F+5S5T5OP\n rlMxMl33DmVEOYurOCLDcQAZqvNZoKLt9CGmMu6bCoTGo23IRcyyfqI1BxVFuT0jUir2aLj2Dyo\n iWc0elQb7YO4WBZfQLYiRNfSCiC7/qAEbaS8lwX5jGKB1LLrCpArbXhxh2hvDVsDD2o1cMm675s\n JJ4p0n4w72HvH0cGCsse6WCyCMFe40d8JpU1++aNNOHeSDU1OV0Li1P/RBM7+uAFIzqJWgsSNph\n G0iCYbKwqu+ZiddtSHKd4wF9o9uZwduP55qN0oEiKu3fLcq30+0NFGdySS2lWP/YtjTkBEbHRpU\n XiceiN3t6MtZ5n6faBb4rEr6WhGQ3sJk0CxZ7WqTdpwHb0hP2X5/MI7AqINcf0whr6Ytx/ejFCw\n W5KxxC7VRleGLMBCljv+/xYyEJzN4AMP6FmjdxWZbBAUrc5HAigZOGS32/QpbLIQ0r5XM91plgX\n CYimES2iybGUxPA==", "X-Developer-Key": "i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "Received-SPF": "pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "They are no longer used after conversion to QOM.\n\nAlso removing the drv_opaque from a few of the pcm_ops methods.\n\nSigned-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>\nReviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>\n---\n audio/audio_int.h | 8 ++------\n audio/audio_template.h | 2 +-\n audio/dsound_template.h | 6 ++----\n audio/alsaaudio.c | 5 ++---\n audio/audio-mixeng-be.c | 15 +--------------\n audio/dbusaudio.c | 4 ++--\n audio/jackaudio.c | 6 ++----\n audio/noaudio.c | 4 ++--\n audio/ossaudio.c | 5 ++---\n audio/paaudio.c | 5 ++---\n audio/pwaudio.c | 4 ++--\n audio/sdlaudio.c | 5 ++---\n audio/sndioaudio.c | 4 ++--\n audio/spiceaudio.c | 5 ++---\n audio/wavaudio.c | 3 +--\n audio/coreaudio.m | 3 +--\n 16 files changed, 28 insertions(+), 56 deletions(-)", "diff": "diff --git a/audio/audio_int.h b/audio/audio_int.h\nindex 6ecd75c4fbf..fb5a9dd871e 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -139,18 +139,15 @@ struct SWVoiceIn {\n typedef struct audio_driver audio_driver;\n struct audio_driver {\n const char *name;\n- void *(*init) (Audiodev *, Error **);\n- void (*fini) (void *);\n struct audio_pcm_ops *pcm_ops;\n int max_voices_out;\n int max_voices_in;\n size_t voice_size_out;\n size_t voice_size_in;\n- QLIST_ENTRY(audio_driver) next;\n };\n \n struct audio_pcm_ops {\n- int (*init_out)(HWVoiceOut *hw, audsettings *as, void *drv_opaque);\n+ int (*init_out)(HWVoiceOut *hw, audsettings *as);\n void (*fini_out)(HWVoiceOut *hw);\n size_t (*write) (HWVoiceOut *hw, void *buf, size_t size);\n void (*run_buffer_out)(HWVoiceOut *hw);\n@@ -173,7 +170,7 @@ struct audio_pcm_ops {\n void (*enable_out)(HWVoiceOut *hw, bool enable);\n void (*volume_out)(HWVoiceOut *hw, Volume *vol);\n \n- int (*init_in) (HWVoiceIn *hw, audsettings *as, void *drv_opaque);\n+ int (*init_in) (HWVoiceIn *hw, audsettings *as);\n void (*fini_in) (HWVoiceIn *hw);\n size_t (*read) (HWVoiceIn *hw, void *buf, size_t size);\n void (*run_buffer_in)(HWVoiceIn *hw);\n@@ -240,7 +237,6 @@ struct AudioMixengBackend {\n \n struct audio_driver *drv;\n Audiodev *dev;\n- void *drv_opaque;\n \n QEMUTimer *ts;\n QLIST_HEAD (hw_in_listhead, HWVoiceIn) hw_head_in;\ndiff --git a/audio/audio_template.h b/audio/audio_template.h\nindex 77a70d6e56a..6c2d2ad5dca 100644\n--- a/audio/audio_template.h\n+++ b/audio/audio_template.h\n@@ -295,7 +295,7 @@ static HW *glue(audio_pcm_hw_add_new_, TYPE)(AudioMixengBackend *s,\n #ifdef DAC\n QLIST_INIT (&hw->cap_head);\n #endif\n- if (glue (hw->pcm_ops->init_, TYPE) (hw, as, s->drv_opaque)) {\n+ if (glue (hw->pcm_ops->init_, TYPE) (hw, as)) {\n goto err0;\n }\n \ndiff --git a/audio/dsound_template.h b/audio/dsound_template.h\nindex 7979773eb86..022a7307c99 100644\n--- a/audio/dsound_template.h\n+++ b/audio/dsound_template.h\n@@ -157,11 +157,9 @@ static void dsound_fini_out (HWVoiceOut *hw)\n }\n \n #ifdef DSBTYPE_IN\n-static int dsound_init_in(HWVoiceIn *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int dsound_init_in(HWVoiceIn *hw, struct audsettings *as)\n #else\n-static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as)\n #endif\n {\n int err;\ndiff --git a/audio/alsaaudio.c b/audio/alsaaudio.c\nindex c2788606b28..0c63d133496 100644\n--- a/audio/alsaaudio.c\n+++ b/audio/alsaaudio.c\n@@ -692,8 +692,7 @@ static void alsa_fini_out (HWVoiceOut *hw)\n alsa_anal_close (&alsa->handle, &alsa->pollhlp);\n }\n \n-static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw;\n struct alsa_params_req req;\n@@ -779,7 +778,7 @@ static void alsa_enable_out(HWVoiceOut *hw, bool enable)\n }\n }\n \n-static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n ALSAVoiceIn *alsa = (ALSAVoiceIn *) hw;\n struct alsa_params_req req;\ndiff --git a/audio/audio-mixeng-be.c b/audio/audio-mixeng-be.c\nindex 45873646b3c..ee593310180 100644\n--- a/audio/audio-mixeng-be.c\n+++ b/audio/audio-mixeng-be.c\n@@ -1521,13 +1521,6 @@ static bool audio_mixeng_backend_realize(AudioBackend *abe,\n audio_driver *drv = AUDIO_MIXENG_BACKEND_GET_CLASS(be)->driver;\n \n be->dev = dev;\n- if (drv->init != NULL) {\n- be->drv_opaque = drv->init(be->dev, errp);\n- if (!be->drv_opaque) {\n- return false;\n- }\n- }\n-\n if (!drv->pcm_ops->get_buffer_in) {\n drv->pcm_ops->get_buffer_in = audio_generic_get_buffer_in;\n drv->pcm_ops->put_buffer_in = audio_generic_put_buffer_in;\n@@ -1665,13 +1658,7 @@ static void audio_mixeng_backend_finalize(Object *obj)\n QLIST_REMOVE(hwi, entries);\n }\n \n- if (s->drv) {\n- if (s->drv->fini) {\n- s->drv->fini (s->drv_opaque);\n- }\n- s->drv = NULL;\n- }\n-\n+ s->drv = NULL;\n if (s->dev) {\n qapi_free_Audiodev(s->dev);\n s->dev = NULL;\ndiff --git a/audio/dbusaudio.c b/audio/dbusaudio.c\nindex fb059815de9..9cc6e826b7e 100644\n--- a/audio/dbusaudio.c\n+++ b/audio/dbusaudio.c\n@@ -173,7 +173,7 @@ dbus_audio_get_nsamples(AudioDbus *da)\n }\n \n static int\n-dbus_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n+dbus_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n AudioDbus *da = AUDIO_DBUS(hw->s);\n DBusVoiceOut *vo = container_of(hw, DBusVoiceOut, hw);\n@@ -287,7 +287,7 @@ dbus_init_in_listener(QemuDBusDisplay1AudioInListener *listener, HWVoiceIn *hw)\n }\n \n static int\n-dbus_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+dbus_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n AudioDbus *da = AUDIO_DBUS(hw->s);\n DBusVoiceIn *vo = container_of(hw, DBusVoiceIn, hw);\ndiff --git a/audio/jackaudio.c b/audio/jackaudio.c\nindex 31e3da6a7fe..d1bf80f8b68 100644\n--- a/audio/jackaudio.c\n+++ b/audio/jackaudio.c\n@@ -507,8 +507,7 @@ static int qjack_client_init(QJackClient *c)\n return 0;\n }\n \n-static int qjack_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int qjack_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n QJackOut *jo = (QJackOut *)hw;\n Audiodev *dev = hw->s->dev;\n@@ -544,8 +543,7 @@ static int qjack_init_out(HWVoiceOut *hw, struct audsettings *as,\n return 0;\n }\n \n-static int qjack_init_in(HWVoiceIn *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int qjack_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n QJackIn *ji = (QJackIn *)hw;\n Audiodev *dev = hw->s->dev;\ndiff --git a/audio/noaudio.c b/audio/noaudio.c\nindex 2bd110caac4..6016f516d4a 100644\n--- a/audio/noaudio.c\n+++ b/audio/noaudio.c\n@@ -62,7 +62,7 @@ static size_t no_write(HWVoiceOut *hw, void *buf, size_t len)\n return audio_rate_get_bytes(&no->rate, &hw->info, len);\n }\n \n-static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n+static int no_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n NoVoiceOut *no = (NoVoiceOut *) hw;\n \n@@ -86,7 +86,7 @@ static void no_enable_out(HWVoiceOut *hw, bool enable)\n }\n }\n \n-static int no_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+static int no_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n NoVoiceIn *no = (NoVoiceIn *) hw;\n \ndiff --git a/audio/ossaudio.c b/audio/ossaudio.c\nindex fedd2bbd722..e6f8d6d41e5 100644\n--- a/audio/ossaudio.c\n+++ b/audio/ossaudio.c\n@@ -493,8 +493,7 @@ static void oss_fini_out (HWVoiceOut *hw)\n }\n }\n \n-static int oss_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int oss_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n OSSVoiceOut *oss = (OSSVoiceOut *) hw;\n struct oss_params req, obt;\n@@ -625,7 +624,7 @@ static void oss_enable_out(HWVoiceOut *hw, bool enable)\n }\n }\n \n-static int oss_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+static int oss_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n OSSVoiceIn *oss = (OSSVoiceIn *) hw;\n struct oss_params req, obt;\ndiff --git a/audio/paaudio.c b/audio/paaudio.c\nindex 97e6c0d1794..35818296282 100644\n--- a/audio/paaudio.c\n+++ b/audio/paaudio.c\n@@ -518,8 +518,7 @@ fail:\n return NULL;\n }\n \n-static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n AudioMixengBackend *amb = hw->s;\n AudioPa *apa = AUDIO_PA(amb);\n@@ -570,7 +569,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as,\n return -1;\n }\n \n-static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n AudioMixengBackend *amb = hw->s;\n AudioPa *apa = AUDIO_PA(amb);\ndiff --git a/audio/pwaudio.c b/audio/pwaudio.c\nindex ca61a1b4ef5..c668ef19a3e 100644\n--- a/audio/pwaudio.c\n+++ b/audio/pwaudio.c\n@@ -524,7 +524,7 @@ qpw_set_position(uint32_t channels, uint32_t position[SPA_AUDIO_MAX_CHANNELS])\n }\n \n static int\n-qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n+qpw_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceOut *pw = (PWVoiceOut *) hw;\n@@ -571,7 +571,7 @@ qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque)\n }\n \n static int\n-qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+qpw_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n AudioPw *c = AUDIO_PW(hw->s);\n PWVoiceIn *pw = (PWVoiceIn *) hw;\ndiff --git a/audio/sdlaudio.c b/audio/sdlaudio.c\nindex 0dfa3100828..a1d453aa307 100644\n--- a/audio/sdlaudio.c\n+++ b/audio/sdlaudio.c\n@@ -345,8 +345,7 @@ static void sdl_fini_out(HWVoiceOut *hw)\n sdl_close_out(sdl);\n }\n \n-static int sdl_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int sdl_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n SDLVoiceOut *sdl = (SDLVoiceOut *)hw;\n SDL_AudioSpec req, obt;\n@@ -402,7 +401,7 @@ static void sdl_fini_in(HWVoiceIn *hw)\n sdl_close_in(sdl);\n }\n \n-static int sdl_init_in(HWVoiceIn *hw, audsettings *as, void *drv_opaque)\n+static int sdl_init_in(HWVoiceIn *hw, audsettings *as)\n {\n SDLVoiceIn *sdl = (SDLVoiceIn *)hw;\n SDL_AudioSpec req, obt;\ndiff --git a/audio/sndioaudio.c b/audio/sndioaudio.c\nindex c15d8b6684a..77685e27cb1 100644\n--- a/audio/sndioaudio.c\n+++ b/audio/sndioaudio.c\n@@ -495,7 +495,7 @@ static void sndio_enable_in(HWVoiceIn *hw, bool enable)\n sndio_enable(self, enable);\n }\n \n-static int sndio_init_out(HWVoiceOut *hw, struct audsettings *as, void *opaque)\n+static int sndio_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n SndioVoice *self = (SndioVoice *) hw;\n \n@@ -508,7 +508,7 @@ static int sndio_init_out(HWVoiceOut *hw, struct audsettings *as, void *opaque)\n return 0;\n }\n \n-static int sndio_init_in(HWVoiceIn *hw, struct audsettings *as, void *opaque)\n+static int sndio_init_in(HWVoiceIn *hw, struct audsettings *as)\n {\n SndioVoice *self = (SndioVoice *) hw;\n \ndiff --git a/audio/spiceaudio.c b/audio/spiceaudio.c\nindex 953dbf6c308..cc6c5d7e287 100644\n--- a/audio/spiceaudio.c\n+++ b/audio/spiceaudio.c\n@@ -108,8 +108,7 @@ static const SpiceRecordInterface record_sif = {\n \n /* playback */\n \n-static int line_out_init(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int line_out_init(HWVoiceOut *hw, struct audsettings *as)\n {\n SpiceVoiceOut *out = container_of (hw, SpiceVoiceOut, hw);\n struct audsettings settings;\n@@ -225,7 +224,7 @@ static void line_out_volume(HWVoiceOut *hw, Volume *vol)\n \n /* record */\n \n-static int line_in_init(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque)\n+static int line_in_init(HWVoiceIn *hw, struct audsettings *as)\n {\n SpiceVoiceIn *in = container_of (hw, SpiceVoiceIn, hw);\n struct audsettings settings;\ndiff --git a/audio/wavaudio.c b/audio/wavaudio.c\nindex f1a414f208c..f9a0484488b 100644\n--- a/audio/wavaudio.c\n+++ b/audio/wavaudio.c\n@@ -78,8 +78,7 @@ static void le_store (uint8_t *buf, uint32_t val, int len)\n }\n }\n \n-static int wav_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int wav_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n WAVVoiceOut *wav = (WAVVoiceOut *) hw;\n int bits16 = 0, stereo = 0;\ndiff --git a/audio/coreaudio.m b/audio/coreaudio.m\nindex 4a0904f0073..a3a0b83eb9d 100644\n--- a/audio/coreaudio.m\n+++ b/audio/coreaudio.m\n@@ -573,8 +573,7 @@ static OSStatus handle_voice_change(\n return 0;\n }\n \n-static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as,\n- void *drv_opaque)\n+static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as)\n {\n OSStatus status;\n coreaudioVoiceOut *core = (coreaudioVoiceOut *) hw;\n", "prefixes": [ "55/85" ] }