aboutsummaryrefslogtreecommitdiff
path: root/hw/misc
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2018-02-28 20:32:43 +0000
committerDavid Gibson <david@gibson.dropbear.id.au>2018-03-06 13:16:29 +1100
commitb6712ea39117c87de87b687ec4055e6ddbde9b37 (patch)
tree19be4af644c0fb132ad641dd5b1b77e25fd7d8f2 /hw/misc
parentaa79b0860e795d879a06656a13bd8f987a36d199 (diff)
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>
Diffstat (limited to 'hw/misc')
-rw-r--r--hw/misc/macio/macio.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index f71ed61819..af1bd46b4b 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -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));
-}