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 --- drivers/adb_bus.c | 3 --- drivers/adb_kbd.c | 3 --- drivers/adb_mouse.c | 3 --- drivers/cuda.c | 3 --- drivers/escc.c | 5 ----- drivers/floppy.c | 3 --- drivers/ide.c | 3 --- drivers/macio.c | 7 ------- drivers/pc_kbd.c | 7 ------- drivers/pc_serial.c | 3 --- drivers/pci.c | 5 ----- drivers/pmu.c | 3 --- drivers/usbhid.c | 3 --- 13 files changed, 51 deletions(-)
diff --git a/drivers/adb_bus.c b/drivers/adb_bus.c index c505322..1aa442a 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 df53fe0..dec8366 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 6ee512f..38eabd5 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 64cc286..6c4b5a6 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 199d571..392625e 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 f34811a..a3dff1f 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 e588f38..6e831a9 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 c01cdfd..e11bc2f 100644 --- a/drivers/macio.c +++ b/drivers/macio.c @@ -167,8 +167,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"); @@ -267,8 +265,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"); @@ -286,9 +282,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 ed6b82c..dfb73bf 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 0d42689..c39afb4 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 d7047d1..72aba9b 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -2080,9 +2080,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; @@ -2125,7 +2122,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 6e488fa..03d073b 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 fdf9711..0060e32 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");