From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 8 May 2017 20:57:34 +0000 (-0300)
Subject: audio: Rename audio_init() to soundhw_init()
X-Git-Tag: v2.10.0-rc0~178^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c565674a2af027fba977bea8ab1bdf440d0cf63;p=thirdparty%2Fqemu.git

audio: Rename audio_init() to soundhw_init()

To make it consistent with the remaining soundhw.c functions and
avoid confusion with the audio_init() function in audio/audio.c,
rename audio_init() to soundhw_init().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-id: 20170508205735.23444-3-ehabkost@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 5e96b73c814..29565da93d4 100644
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -129,7 +129,7 @@ void select_soundhw(const char *optarg)
     }
 }
 
-void audio_init(void)
+void soundhw_init(void)
 {
     struct soundhw *c;
     ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 96a4813b3fe..4a7d2cfbe00 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -783,7 +783,7 @@ static void ibm_40p_init(MachineState *machine)
                        &cmos_checksum);
 
     /* initialize audio subsystem */
-    audio_init();
+    soundhw_init();
 
     /* add some more devices */
     if (defaults_enabled()) {
diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h
index 259bb2cf961..119f7d78d50 100644
--- a/include/hw/audio/audio.h
+++ b/include/hw/audio/audio.h
@@ -7,7 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
 void pci_register_soundhw(const char *name, const char *descr,
                           int (*init_pci)(PCIBus *bus));
 
-void audio_init(void);
+void soundhw_init(void);
 void select_soundhw(const char *optarg);
 
 #endif
diff --git a/vl.c b/vl.c
index 6e46889cdeb..8f08f422a77 100644
--- a/vl.c
+++ b/vl.c
@@ -4575,7 +4575,7 @@ int main(int argc, char **argv, char **envp)
 
     realtime_init();
 
-    audio_init();
+    soundhw_init();
 
     if (hax_enabled()) {
         hax_sync_vcpus();