audio: remove unused parameter isa_pic

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/arch_init.c b/arch_init.c
index 3bc2a41dd2a69be591706a9d98bb586a40cf4510..d4c92b0a456be86ba7fab50c1eeff9da8b0189c0 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -473,7 +473,7 @@ struct soundhw {
     int enabled;
     int isa;
     union {
-        int (*init_isa) (ISABus *bus, qemu_irq *pic);
+        int (*init_isa) (ISABus *bus);
         int (*init_pci) (PCIBus *bus);
     } init;
 };
@@ -628,15 +628,15 @@ void select_soundhw(const char *optarg)
     }
 }
 
-void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus)
+void audio_init(ISABus *isa_bus, PCIBus *pci_bus)
 {
     struct soundhw *c;
 
     for (c = soundhw; c->name; ++c) {
         if (c->enabled) {
             if (c->isa) {
-                if (isa_pic) {
-                    c->init.init_isa(isa_bus, isa_pic);
+                if (isa_bus) {
+                    c->init.init_isa(isa_bus);
                 }
             } else {
                 if (pci_bus) {
@@ -650,7 +650,7 @@ void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus)
 void select_soundhw(const char *optarg)
 {
 }
-void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus)
+void audio_init(ISABus *isa_bus, PCIBus *pci_bus)
 {
 }
 #endif

diff --git a/arch_init.h b/arch_init.h
index 074f02a8cdf205519aa4f66218388610c5c5ed6a..828256cc42dedb6575529f3391428faed729c371 100644 (file)
--- a/arch_init.h
+++ b/arch_init.h
@@ -27,7 +27,7 @@ void do_acpitable_option(const char *optarg);
 void do_smbios_option(const char *optarg);
 void cpudef_init(void);
 int audio_available(void);
-void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus);
+void audio_init(ISABus *isa_bus, PCIBus *pci_bus);
 int tcg_available(void);
 int kvm_available(void);
 int xen_available(void);

diff --git a/hw/adlib.c b/hw/adlib.c
index b5e15644ac560f40fc256302d55ab5563d3f9821..dd8b1888cfdceed0d8d9452b26f2277f176c97a0 100644 (file)
--- a/hw/adlib.c
+++ b/hw/adlib.c
@@ -275,7 +275,7 @@ static void Adlib_fini (AdlibState *s)
     AUD_remove_card (&s->card);
 }
 
-int Adlib_init (ISABus *bus, qemu_irq *pic)
+int Adlib_init (ISABus *bus)
 {
     AdlibState *s = &glob_adlib;
     struct audsettings as;

diff --git a/hw/audiodev.h b/hw/audiodev.h
index bfa324a7992b08fe01cbf3f7b057cff125b5524f..ed2790f5f60469474aa4c0d2950cbe97ec6e04d9 100644 (file)
--- a/hw/audiodev.h
+++ b/hw/audiodev.h
@@ -2,19 +2,19 @@
 int es1370_init(PCIBus *bus);
 
 /* sb16.c */
-int SB16_init(ISABus *bus, qemu_irq *pic);
+int SB16_init(ISABus *bus);
 
 /* adlib.c */
-int Adlib_init(ISABus *bus, qemu_irq *pic);
+int Adlib_init(ISABus *bus);
 
 /* gus.c */
-int GUS_init(ISABus *bus, qemu_irq *pic);
+int GUS_init(ISABus *bus);
 
 /* ac97.c */
 int ac97_init(PCIBus *bus);
 
 /* cs4231a.c */
-int cs4231a_init(ISABus *bus, qemu_irq *pic);
+int cs4231a_init(ISABus *bus);
 
 /* intel-hda.c + hda-audio.c */
 int intel_hda_and_codec_init(PCIBus *bus);

diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 02388298a6d09ecfefca29ada8045d43e808a630..dc77a3aa151d2d18d16d766e76573e8e942a023b 100644 (file)
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -659,7 +659,7 @@ static int cs4231a_initfn (ISADevice *dev)
     return 0;
 }
 
-int cs4231a_init (ISABus *bus, qemu_irq *pic)
+int cs4231a_init (ISABus *bus)
 {
     isa_create_simple (bus, "cs4231a");
     return 0;

diff --git a/hw/gus.c b/hw/gus.c
index 17cceee5baeb72b55a05400b0ff484ba70cceddc..ab872d8dc538beac9461e0c84d79a7658f3f8c35 100644 (file)
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -293,7 +293,7 @@ static int gus_initfn (ISADevice *dev)
     return 0;
 }
 
-int GUS_init (ISABus *bus, qemu_irq *pic)
+int GUS_init (ISABus *bus)
 {
     isa_create_simple (bus, "gus");
     return 0;

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 8ed66cecca3bf31dcabba2cb054c1b3a7c80a9fa..da0498201a5da4e4c3145562ea7c8c95c3613cc1 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -281,7 +281,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
 
     /* Sound card */
     /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */
-    audio_init(isa_bus, i8259, NULL);
+    audio_init(isa_bus, NULL);
 
     /* NVRAM */
     dev = qdev_create(NULL, "ds1225y");

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 330924eeefefad5092cf55c097e6481136e7d724..d94ad1d8c1a279d294fbb7438ebd828d6a8987df 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -973,7 +973,7 @@ void mips_malta_init (ram_addr_t ram_size,
     fdctrl_init_isa(isa_bus, fd);
 
     /* Sound card */
-    audio_init(isa_bus, NULL, pci_bus);
+    audio_init(isa_bus, pci_bus);
 
     /* Network card */
     network_init();

diff --git a/hw/pc.h b/hw/pc.h
index 17648ccb0d2fba726e1f49f4181110c29bd3ee4f..13e41f101e5f55adb84c267d28e338b0efba4b35 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -176,7 +176,7 @@ extern int no_hpet;
 
 /* pcspk.c */
 void pcspk_init(ISADevice *pit);
-int pcspk_audio_init(ISABus *bus, qemu_irq *pic);
+int pcspk_audio_init(ISABus *bus);
 
 /* piix_pci.c */
 struct PCII440FXState;

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 77b88b40cf9fe0539d7fa160423414019182902f..b70431fe87903bee1cb03764e8f1a1ffe0b7cbbf 100644 (file)
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -222,7 +222,7 @@ static void pc_init1(MemoryRegion *system_memory,
     qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL),
                             "rtc", (DeviceState *)rtc_state, NULL);
 
-    audio_init(isa_bus, gsi, pci_enabled ? pci_bus : NULL);
+    audio_init(isa_bus, pci_enabled ? pci_bus : NULL);
 
     pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
                  floppy, idebus[0], idebus[1], rtc_state);

diff --git a/hw/pcspk.c b/hw/pcspk.c
index 4d949fbce7ca172dba9780119d97ee0e7b5cd7e9..acb016773b02007feb09ba73a5d532650a25d96a 100644 (file)
--- a/hw/pcspk.c
+++ b/hw/pcspk.c
@@ -96,7 +96,7 @@ static void pcspk_callback(void *opaque, int free)
     }
 }
 
-int pcspk_audio_init(ISABus *bus, qemu_irq *pic)
+int pcspk_audio_init(ISABus *bus)
 {
     PCSpkState *s = &pcspk_state;
     struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0};

diff --git a/hw/sb16.c b/hw/sb16.c
index 88ad8e85cdedd003874654945adf4bd8c118fdfb..887b32e7942d384062515544a99266a2f7487fd0 100644 (file)
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -1385,7 +1385,7 @@ static int sb16_initfn (ISADevice *dev)
     return 0;
 }
 
-int SB16_init (ISABus *bus, qemu_irq *pic)
+int SB16_init (ISABus *bus)
 {
     isa_create_simple (bus, "sb16");
     return 0;