diff --git a/src/northbridge/intel/x4x/memmap.c b/src/northbridge/intel/x4x/memmap.c
index 6d40fafc67..8a69ba80a8 100644
--- a/src/northbridge/intel/x4x/memmap.c
+++ b/src/northbridge/intel/x4x/memmap.c
@@ -61,11 +61,7 @@ int decode_pcie_bar(u32 *const base, u32 *const len)
 {
 	*base = 0;
 	*len = 0;
-	const pci_devfn_t dev = PCI_DEV(0, 0, 0);
-	u32 pciexbar = 0;
-	u32 pciexbar_reg;
-	u32 reg32;
-	int max_buses;
+
 	const struct {
 		u16 num_buses;
 		u32 addr_mask;
@@ -76,16 +72,16 @@ int decode_pcie_bar(u32 *const base, u32 *const len)
 		{0,   0},
 	};
 
-	pciexbar_reg = pci_read_config32(dev, D0F0_PCIEXBAR_LO);
+	const u32 pciexbar_reg = pci_read_config32(PCI_DEV(0, 0, 0), D0F0_PCIEXBAR_LO);
 
 	if (!(pciexbar_reg & 1)) {
 		printk(BIOS_WARNING, "WARNING: MMCONF not set\n");
 		return 0;
 	}
 
-	reg32 = (pciexbar_reg >> 1) & 3;
-	pciexbar = pciexbar_reg & busmask[reg32].addr_mask;
-	max_buses = busmask[reg32].num_buses;
+	const u32 index = (pciexbar_reg >> 1) & 3;
+	const u32 pciexbar = pciexbar_reg & busmask[index].addr_mask;
+	const int max_buses = busmask[index].num_buses;
 
 	if (!pciexbar) {
 		printk(BIOS_WARNING, "WARNING: pciexbar invalid\n");