2 files changed, 6 insertions, 18 deletions

diff --git a/src/mainboard/asus/f2a85-m/get_bus_conf.c b/src/mainboard/asus/f2a85-m/get_bus_conf.c
index 389ab8f368..fe8253ee03 100644
--- a/src/mainboard/asus/f2a85-m/get_bus_conf.c
+++ b/src/mainboard/asus/f2a85-m/get_bus_conf.c
@@ -33,16 +33,7 @@
 u8 bus_hudson[6];
 u32 apicid_hudson;
 
-/*
- * Here you only need to set value in pci1234 for HT-IO that could be installed or not
- * You may need to preset pci1234 for HTIO board,
- * please refer to src/northbridge/amd/amdk8/get_sblk_pci1234.c for detail
- */
-u32 pci1234x[] = {
-	0x0000ff0,
-};
 
-u32 sbdn_hudson;
 
 void get_bus_conf(void)
 {
@@ -51,23 +42,21 @@ void get_bus_conf(void)
 	device_t dev;
 	int i;
 
-	sbdn_hudson = 0;
 
 	memset(bus_hudson, 0, sizeof(bus_hudson));
 
 
 
-	bus_hudson[0] = (pci1234x[0] >> 16) & 0xff;
 
 	/* Hudson */
-	dev = dev_find_slot(bus_hudson[0], PCI_DEVFN(sbdn_hudson + 0x14, 4));
+	dev = dev_find_slot(0, PCI_DEVFN(0x14, 4));
 
 	if (dev) {
 		bus_hudson[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
 	}
 
 	for (i = 0; i < 4; i++) {
-		dev = dev_find_slot(bus_hudson[0], PCI_DEVFN(sbdn_hudson + 0x14, i));
+		dev = dev_find_slot(0, PCI_DEVFN(0x14, i));
 		if (dev) {
 			bus_hudson[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
 		}
diff --git a/src/mainboard/asus/f2a85-m/irq_tables.c b/src/mainboard/asus/f2a85-m/irq_tables.c
index 8fb6ff35b2..0bab5c9ca5 100644
--- a/src/mainboard/asus/f2a85-m/irq_tables.c
+++ b/src/mainboard/asus/f2a85-m/irq_tables.c
@@ -20,6 +20,7 @@
 #include <arch/pirq_routing.h>
 #include <console/console.h>
 #include <cpu/amd/amdfam15.h>
+#include <device/pci_def.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -42,8 +43,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
 	pirq_info->rfu = rfu;
 }
 
-extern u8 bus_hudson[6];
-extern unsigned long sbdn_hudson;
 
 unsigned long write_pirq_routing_table(unsigned long addr)
 {
@@ -68,8 +67,8 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->signature = PIRQ_SIGNATURE;
 	pirq->version = PIRQ_VERSION;
 
-	pirq->rtr_bus = bus_hudson[0];
-	pirq->rtr_devfn = ((sbdn_hudson + 0x14) << 3) | 4;
+	pirq->rtr_bus = 0;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -84,7 +83,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_hudson[0], ((sbdn_hudson + 0x14) << 3) | 4,
+	write_pirq_info(pirq_info, 0, PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;