From: Marc-André Lureau <marcandre.lureau@redhat.com>
Remove the legacy driver init/fini callbacks from the CoreAudio backend.
Both coreaudio_audio_init() and coreaudio_audio_fini() were no-ops that
performed no real initialization or cleanup work. Access to the
Audiodev is now through hw->s->dev instead of the drv_opaque pointer.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
audio/coreaudio.m | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/audio/coreaudio.m b/audio/coreaudio.m
index 710ef0fe6ba..4ab2abfc6f7 100644
--- a/audio/coreaudio.m
+++ b/audio/coreaudio.m
@@ -579,7 +579,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as,
OSStatus status;
coreaudioVoiceOut *core = (coreaudioVoiceOut *) hw;
int err;
- Audiodev *dev = drv_opaque;
+ Audiodev *dev = hw->s->dev;
AudiodevCoreaudioPerDirectionOptions *cpdo = dev->u.coreaudio.out;
struct audsettings obt_as;
@@ -656,15 +656,6 @@ static void coreaudio_enable_out(HWVoiceOut *hw, bool enable)
update_device_playback_state(core);
}
-static void *coreaudio_audio_init(Audiodev *dev, Error **errp)
-{
- return dev;
-}
-
-static void coreaudio_audio_fini (void *opaque)
-{
-}
-
static struct audio_pcm_ops coreaudio_pcm_ops = {
.init_out = coreaudio_init_out,
.fini_out = coreaudio_fini_out,
@@ -681,8 +672,6 @@ static void coreaudio_audio_fini (void *opaque)
static struct audio_driver coreaudio_audio_driver = {
.name = "coreaudio",
- .init = coreaudio_audio_init,
- .fini = coreaudio_audio_fini,
.pcm_ops = &coreaudio_pcm_ops,
.max_voices_out = 1,
.max_voices_in = 0,
--
2.52.0