amdfam10 boards: Use PCI_DEVFN()

Change-Id: I301ed4024f1dd6fb2009d59b2992830d4f17ee2f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30639
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

14 files changed, 26 insertions, 26 deletions

diff --git a/src/mainboard/advansus/a785e-i/irq_tables.c b/src/mainboard/advansus/a785e-i/irq_tables.c
index 006a8dd155..5d08c1fbdf 100644
--- a/src/mainboard/advansus/a785e-i/irq_tables.c
+++ b/src/mainboard/advansus/a785e-i/irq_tables.c
@@ -65,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb800[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -80,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb800[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/amd/bimini_fam10/irq_tables.c b/src/mainboard/amd/bimini_fam10/irq_tables.c
index 9ffa97ac0e..40f283639b 100644
--- a/src/mainboard/amd/bimini_fam10/irq_tables.c
+++ b/src/mainboard/amd/bimini_fam10/irq_tables.c
@@ -65,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb800[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -80,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb800[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/amd/mahogany_fam10/irq_tables.c b/src/mainboard/amd/mahogany_fam10/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/amd/mahogany_fam10/irq_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/amd/tilapia_fam10/irq_tables.c b/src/mainboard/amd/tilapia_fam10/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/amd/tilapia_fam10/irq_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/asus/kcma-d8/irq_tables.c b/src/mainboard/asus/kcma-d8/irq_tables.c
index 71798deafc..df6dae06cc 100644
--- a/src/mainboard/asus/kcma-d8/irq_tables.c
+++ b/src/mainboard/asus/kcma-d8/irq_tables.c
@@ -103,7 +103,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	/* pci bridge */
 	write_pirq_info(pirq_info, bus_sp5100[0],
-			(0x14 << 3) | 4, LNKA, IRQBM, LNKB,
+			PCI_DEVFN(0x14, 4), LNKA, IRQBM, LNKB,
 			IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
 	pirq_info++;
 	slot_num++;
diff --git a/src/mainboard/asus/kgpe-d16/irq_tables.c b/src/mainboard/asus/kgpe-d16/irq_tables.c
index 71798deafc..df6dae06cc 100644
--- a/src/mainboard/asus/kgpe-d16/irq_tables.c
+++ b/src/mainboard/asus/kgpe-d16/irq_tables.c
@@ -103,7 +103,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	/* pci bridge */
 	write_pirq_info(pirq_info, bus_sp5100[0],
-			(0x14 << 3) | 4, LNKA, IRQBM, LNKB,
+			PCI_DEVFN(0x14, 4), LNKA, IRQBM, LNKB,
 			IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
 	pirq_info++;
 	slot_num++;
diff --git a/src/mainboard/asus/m5a88-v/irq_tables.c b/src/mainboard/asus/m5a88-v/irq_tables.c
index 006a8dd155..5d08c1fbdf 100644
--- a/src/mainboard/asus/m5a88-v/irq_tables.c
+++ b/src/mainboard/asus/m5a88-v/irq_tables.c
@@ -65,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb800[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -80,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb800[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/avalue/eax-785e/irq_tables.c b/src/mainboard/avalue/eax-785e/irq_tables.c
index 006a8dd155..5d08c1fbdf 100644
--- a/src/mainboard/avalue/eax-785e/irq_tables.c
+++ b/src/mainboard/avalue/eax-785e/irq_tables.c
@@ -65,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb800[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -80,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb800[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/gigabyte/ma785gm/irq_tables.c b/src/mainboard/gigabyte/ma785gm/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/gigabyte/ma785gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/gigabyte/ma785gmt/irq_tables.c b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/gigabyte/ma785gmt/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/gigabyte/ma78gm/irq_tables.c b/src/mainboard/gigabyte/ma78gm/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/gigabyte/ma78gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/jetway/pa78vm5/irq_tables.c b/src/mainboard/jetway/pa78vm5/irq_tables.c
index 70d427e9c6..9d4624ff6f 100644
--- a/src/mainboard/jetway/pa78vm5/irq_tables.c
+++ b/src/mainboard/jetway/pa78vm5/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sb700[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -81,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	slot_num = 0;
 
 	/* pci bridge */
-	write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
+	write_pirq_info(pirq_info, bus_sb700[0], PCI_DEVFN(0x14, 4),
 			0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
 			0);
 	pirq_info++;
diff --git a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
index 6591041c16..5f9c50d610 100644
--- a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
@@ -66,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq->version = PIRQ_VERSION;
 
 	pirq->rtr_bus = bus_sp5100[0];
-	pirq->rtr_devfn = (0x14 << 3) | 4;
+	pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
 
 	pirq->exclusive_irqs = 0;
 
@@ -82,7 +82,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	/* pci bridge */
 	write_pirq_info(pirq_info, bus_sp5100[0],
-			(0x14 << 3) | 4, 0x1, 0xdef8, 0x2,
+			PCI_DEVFN(0x14, 4), 0x1, 0xdef8, 0x2,
 			0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
 	pirq_info++;
 	slot_num++;