[OpenBIOS] [PATCH V2 5/5] Remove unnecessary newworld check
Amadeusz Sławiński
amade at asmblr.net
Fri Mar 22 18:25:30 CET 2013
openpic_init is only called on newworld machines
Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
---
drivers/macio.c | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/drivers/macio.c b/drivers/macio.c
index 25294e5..59ad1f6 100644
--- a/drivers/macio.c
+++ b/drivers/macio.c
@@ -167,43 +167,41 @@ openpic_init(const char *path, phys_addr_t addr)
fword("finish-device");
- if (is_newworld()) {
- u32 *interrupt_map;
- int len, i;
+ u32 *interrupt_map;
+ int len, i;
- /* patch in interrupt parent */
- dnode = find_dev(buf);
+ /* patch in interrupt parent */
+ dnode = find_dev(buf);
- target_node = find_dev("/pci/mac-io");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/escc/ch-a");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/escc/ch-a");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/escc/ch-b");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/escc/ch-b");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/ata-1");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/ata-1");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/ata-2");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/ata-2");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/ata-3");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/ata-3");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci/mac-io/via-cuda");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci/mac-io/via-cuda");
+ set_int_property(target_node, "interrupt-parent", dnode);
- target_node = find_dev("/pci");
- set_int_property(target_node, "interrupt-parent", dnode);
+ target_node = find_dev("/pci");
+ set_int_property(target_node, "interrupt-parent", dnode);
- interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len);
- for (i = 0; i < 8; i++) {
- interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode;
- }
- set_property(target_node, "interrupt-map", (char *)interrupt_map, len);
+ interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len);
+ for (i = 0; i < 8; i++) {
+ interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode;
}
+ set_property(target_node, "interrupt-map", (char *)interrupt_map, len);
}
DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");
--
1.8.1.5
More information about the OpenBIOS
mailing list