diff options
author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2019-08-18 21:16:50 +0100 |
---|---|---|
committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2019-08-18 21:16:50 +0100 |
commit | c79f5342431942264507c46fad3a3033a4aff870 (patch) | |
tree | 132026908be8446b59f39e9bf98fd283236ffce0 | |
parent | 81b1da3a74fc4a72ae2224e4fdf8baed6e8b6443 (diff) | |
download | qemu-openbios-c79f5342431942264507c46fad3a3033a4aff870.tar.gz |
pci: remove explicit find-device from PCI devices
Since the correct active package is now being set during probe, there is no
need to explicitly find the parent node before creating the device.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
-rw-r--r-- | drivers/adb_bus.c | 3 | ||||
-rw-r--r-- | drivers/adb_kbd.c | 3 | ||||
-rw-r--r-- | drivers/adb_mouse.c | 3 | ||||
-rw-r--r-- | drivers/cuda.c | 3 | ||||
-rw-r--r-- | drivers/escc.c | 5 | ||||
-rw-r--r-- | drivers/floppy.c | 3 | ||||
-rw-r--r-- | drivers/ide.c | 3 | ||||
-rw-r--r-- | drivers/macio.c | 7 | ||||
-rw-r--r-- | drivers/pc_kbd.c | 7 | ||||
-rw-r--r-- | drivers/pc_serial.c | 3 | ||||
-rw-r--r-- | drivers/pci.c | 5 | ||||
-rw-r--r-- | drivers/pmu.c | 3 | ||||
-rw-r--r-- | drivers/usbhid.c | 3 |
13 files changed, 0 insertions, 51 deletions
diff --git a/drivers/adb_bus.c b/drivers/adb_bus.c index c5053223..1aa442ac 100644 --- a/drivers/adb_bus.c +++ b/drivers/adb_bus.c @@ -76,9 +76,6 @@ int adb_bus_init (char *path, adb_bus_t *bus) int reloc = 0, next_free = 7; int keep; - push_str(path); - fword("find-device"); - fword("new-device"); push_str("adb"); diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index df53fe09..dec83665 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -552,9 +552,6 @@ void *adb_kbd_new (char *path, void *private) my_adb_dev = dev; } - push_str(path); - fword("find-device"); - fword("new-device"); push_str("keyboard"); diff --git a/drivers/adb_mouse.c b/drivers/adb_mouse.c index 6ee512fb..38eabd55 100644 --- a/drivers/adb_mouse.c +++ b/drivers/adb_mouse.c @@ -51,9 +51,6 @@ void adb_mouse_new (char *path, void *private) phandle_t aliases; adb_dev_t *dev = private; - push_str(path); - fword("find-device"); - fword("new-device"); push_str("mouse"); diff --git a/drivers/cuda.c b/drivers/cuda.c index d88edf8a..56d73e12 100644 --- a/drivers/cuda.c +++ b/drivers/cuda.c @@ -398,9 +398,6 @@ cuda_t *cuda_init (const char *path, phys_addr_t base) if (cuda == NULL) return NULL; - push_str(path); - fword("find-device"); - fword("new-device"); push_str("via-cuda"); diff --git a/drivers/escc.c b/drivers/escc.c index 199d571c..392625e4 100644 --- a/drivers/escc.c +++ b/drivers/escc.c @@ -450,9 +450,6 @@ escc_add_channel(const char *path, const char *node, phys_addr_t addr, /* add device */ - push_str(path); - fword("find-device"); - fword("new-device"); snprintf(buf, sizeof(buf), "ch-%s", node); @@ -531,8 +528,6 @@ escc_init(const char *path, phys_addr_t addr) int props[2]; phandle_t dnode; - push_str(path); - fword("find-device"); fword("new-device"); push_str("escc"); diff --git a/drivers/floppy.c b/drivers/floppy.c index f34811af..a3dff1fc 100644 --- a/drivers/floppy.c +++ b/drivers/floppy.c @@ -1146,9 +1146,6 @@ int ob_floppy_init(const char *path, const char *dev_name, char nodebuff[128]; phandle_t aliases; - push_str(path); - fword("find-device"); - fword("new-device"); push_str(dev_name); diff --git a/drivers/ide.c b/drivers/ide.c index 36e3b897..e56cb4c1 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1585,9 +1585,6 @@ int macio_ide_init(const char *path, uint32_t addr, int nb_channels) * Also see comments in pci.c:ob_pci_host_set_interrupt_map() */ current_channel = 3; - push_str(path); - fword("find-device"); - for (i = 0; i < nb_channels; i++) { chan = malloc(sizeof(struct ide_channel)); diff --git a/drivers/macio.c b/drivers/macio.c index 62a1e74d..496bab13 100644 --- a/drivers/macio.c +++ b/drivers/macio.c @@ -168,8 +168,6 @@ openpic_init(const char *path, phys_addr_t addr) int props[2]; char buf[128]; - push_str(path); - fword("find-device"); fword("new-device"); push_str("interrupt-controller"); fword("device-name"); @@ -268,8 +266,6 @@ ob_unin_init(void) phandle_t dnode; int props[2]; - push_str("/"); - fword("find-device"); fword("new-device"); push_str("uni-n"); fword("device-name"); @@ -287,9 +283,6 @@ ob_unin_init(void) static void macio_gpio_init(const char *path) { - push_str(path); - fword("find-device"); - fword("new-device"); push_str("gpio"); diff --git a/drivers/pc_kbd.c b/drivers/pc_kbd.c index ed6b82c8..dfb73bff 100644 --- a/drivers/pc_kbd.c +++ b/drivers/pc_kbd.c @@ -208,9 +208,6 @@ ob_pc_kbd_init(const char *path, const char *kdev_name, const char *mdev_name, { phandle_t chosen, aliases; char nodebuff[128]; - - push_str(path); - fword("find-device"); fword("new-device"); @@ -303,10 +300,6 @@ ob_pc_kbd_init(const char *path, const char *kdev_name, const char *mdev_name, /* Mouse (optional) */ if (mdev_name != NULL) { - snprintf(nodebuff, sizeof(nodebuff), "%s/8042", path); - push_str(nodebuff); - fword("find-device"); - fword("new-device"); push_str(mdev_name); diff --git a/drivers/pc_serial.c b/drivers/pc_serial.c index 0d426891..c39afb4c 100644 --- a/drivers/pc_serial.c +++ b/drivers/pc_serial.c @@ -168,9 +168,6 @@ ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, phandle_t aliases; char nodebuff[128]; - push_str(path); - fword("find-device"); - fword("new-device"); push_str(dev_name); diff --git a/drivers/pci.c b/drivers/pci.c index c2da62fe..4fba12ad 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -2083,9 +2083,6 @@ int ob_pci_init(void) PCI_DPRINTF("Initializing PCI host bridge...\n"); - push_str("/"); - fword("find-device"); - /* Find all PCI bridges */ mem_base = arch->pci_mem_base; @@ -2128,7 +2125,5 @@ int ob_pci_init(void) intc = ob_pci_host_set_interrupt_map(phandle_host); ob_pci_bus_set_interrupt_map(phandle_host, intc, ob_pci_host_bus_interrupt); - device_end(); - return 0; } diff --git a/drivers/pmu.c b/drivers/pmu.c index 38fa1e82..f74a30bb 100644 --- a/drivers/pmu.c +++ b/drivers/pmu.c @@ -606,9 +606,6 @@ pmu_t *pmu_init(const char *path, phys_addr_t base) return NULL; } - push_str(path); - fword("find-device"); - fword("new-device"); push_str("via-pmu"); diff --git a/drivers/usbhid.c b/drivers/usbhid.c index a847b6eb..b8e1548b 100644 --- a/drivers/usbhid.c +++ b/drivers/usbhid.c @@ -564,9 +564,6 @@ void ob_usb_hid_add_keyboard(const char *path) char name[128]; phandle_t aliases; - push_str(path); - fword("find-device"); - fword("new-device"); push_str("keyboard"); |