macio: remove macio_init() function

Move the remaining comment into macio.c for reference, then remove the
macio_init() function and instantiate the macio devices for both Old World
and New World machines via qdev_init_nofail() directly.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-02-28 20:32:43 +00:00 committed by David Gibson
parent aa79b0860e
commit b6712ea391
3 changed files with 5 additions and 14 deletions

View file

@ -33,6 +33,9 @@
#include "hw/misc/macio/macio.h"
#include "hw/intc/heathrow_pic.h"
/* Note: this code is strongly inspirated from the corresponding code
* in PearPC */
/*
* The mac-io has two interfaces to the ESCC. One is called "escc-legacy",
* while the other one is the normal, current ESCC interface.
@ -442,11 +445,3 @@ static void macio_register_types(void)
}
type_init(macio_register_types)
void macio_init(PCIDevice *d,
MemoryRegion *pic_mem)
{
/* Note: this code is strongly inspirated from the corresponding code
in PearPC */
qdev_init_nofail(DEVICE(d));
}