Since the linked list of QEMUSoundCard structs was removed, AUD_remove_card does nothing useful. Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> --- audio/audio.c | 4 ---- audio/audio.h | 1 - hw/audio/ac97.c | 1 - hw/audio/adlib.c | 1 - hw/audio/es1370.c | 1 - hw/audio/gus.c | 1 - hw/audio/hda-codec.c | 1 - hw/audio/wm8750.c | 1 - hw/usb/dev-audio.c | 1 - 9 files changed, 12 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 217095306f..00128c2ad7 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1833,10 +1833,6 @@ void AUD_register_card (const char *name, QEMUSoundCard *card) } } -void AUD_remove_card (QEMUSoundCard *card) -{ -} - static struct audio_pcm_ops capture_pcm_ops; CaptureVoiceOut *AUD_add_capture( diff --git a/audio/audio.h b/audio/audio.h index ebcc540431..8ee0e2159a 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -93,7 +93,6 @@ void AUD_vlog (const char *cap, const char *fmt, va_list ap) G_GNUC_PRINTF(2, 0) void AUD_log (const char *cap, const char *fmt, ...) G_GNUC_PRINTF(2, 3); void AUD_register_card (const char *name, QEMUSoundCard *card); -void AUD_remove_card (QEMUSoundCard *card); CaptureVoiceOut *AUD_add_capture( AudioState *s, struct audsettings *as, diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 364cdfa733..fd8d3abba4 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1358,7 +1358,6 @@ static void ac97_exit(PCIDevice *dev) AUD_close_in(&s->card, s->voice_pi); AUD_close_out(&s->card, s->voice_po); AUD_close_in(&s->card, s->voice_mc); - AUD_remove_card(&s->card); } static Property ac97_properties[] = { diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index 5f979b1487..79b1b8e271 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -240,7 +240,6 @@ static void Adlib_fini (AdlibState *s) s->active = 0; s->enabled = 0; - AUD_remove_card (&s->card); } static MemoryRegionPortio adlib_portio_list[] = { diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index 54cc19a637..9a504db37e 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -882,7 +882,6 @@ static void es1370_exit(PCIDevice *dev) } AUD_close_in(&s->card, s->adc_voice); - AUD_remove_card(&s->card); } static Property es1370_properties[] = { diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 42f010b671..c086502708 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -263,7 +263,6 @@ static void gus_realizefn (DeviceState *dev, Error **errp) ); if (!s->voice) { - AUD_remove_card (&s->card); error_setg(errp, "No voice"); return; } diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index feb8f9e2bb..f70a6798df 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -743,7 +743,6 @@ static void hda_audio_exit(HDACodecDevice *hda) AUD_close_in(&a->card, st->voice.in); } } - AUD_remove_card(&a->card); } static int hda_audio_post_load(void *opaque, int version) diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index b5722b37c3..b63943dd3e 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -634,7 +634,6 @@ static void wm8750_fini(I2CSlave *i2c) WM8750State *s = WM8750(i2c); wm8750_reset(I2C_SLAVE(s)); - AUD_remove_card(&s->card); g_free(s); } #endif diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 8748c1ba04..72cc89548e 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -934,7 +934,6 @@ static void usb_audio_unrealize(USBDevice *dev) usb_audio_set_output_altset(s, ALTSET_OFF); AUD_close_out(&s->card, s->out.voice); - AUD_remove_card(&s->card); streambuf_fini(&s->out.buf); } -- 2.38.1