Commit 6d034b7b authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

hw/ppc/prep: Remove superfluous call to soundhw_init() 



When using the 40p machine, soundhw_init() is currently called twice,
one time from vl.c and one time from ibm_40p_init(). The call in
ibm_40p_init() was likely just a copy-and-paste from a old version
of the prep machine - but there the call to audio_init() (which was
the previous name of this function) has been removed many years ago
already, with commit b3e6d591
("audio: enable PCI audio cards for all PCI-enabled targets"), so
we certainly also do not need the soundhw_init() in the 40p function
anymore nowadays.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarSahid Ferdjaoui <sferdjao@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent c5eb5846

hw/ppc/prep.c

+0 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "hw/pci/pci_host.h"

#include "hw/ppc/ppc.h"

#include "hw/boards.h"

#include "hw/audio/soundhw.h"

#include "qemu/error-report.h"

#include "qemu/log.h"

#include "hw/ide.h"
@@ -782,9 +781,6 @@ static void ibm_40p_init(MachineState *machine) 
    qbus_walk_children(BUS(isa_bus), prep_set_cmos_checksum, NULL, NULL, NULL,

                       &cmos_checksum);



    /* initialize audio subsystem */

    soundhw_init();



    /* add some more devices */

    if (defaults_enabled()) {

        isa_create_simple(isa_bus, "i8042");