summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/cavium/cn81xx/ecam0.c2
-rw-r--r--src/soc/cavium/common/include/soc/ecam.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c
index ff3e7097ff..db5090f5df 100644
--- a/src/soc/cavium/cn81xx/ecam0.c
+++ b/src/soc/cavium/cn81xx/ecam0.c
@@ -181,7 +181,7 @@ static size_t ecam0_pci_enable_msix(struct device *dev,
dev_path(dev));
return -1;
}
- bar = ecam0_get_bar_val(dev, bar_idx);
+ bar = ecam0_get_bar_val(pcidev_bdf(dev), bar_idx);
if (!bar) {
printk(BIOS_ERR, "%s: Failed to find MSI-X bar\n",
dev_path(dev));
diff --git a/src/soc/cavium/common/include/soc/ecam.h b/src/soc/cavium/common/include/soc/ecam.h
index b0f10dc32e..534c165d73 100644
--- a/src/soc/cavium/common/include/soc/ecam.h
+++ b/src/soc/cavium/common/include/soc/ecam.h
@@ -3,14 +3,8 @@
#ifndef __COREBOOT_SRC_SOC_CAVIUM_COMMON_INCLUDE_SOC_ECAM_H
#define __COREBOOT_SRC_SOC_CAVIUM_COMMON_INCLUDE_SOC_ECAM_H
-#ifdef __SIMPLE_DEVICE__
#include <device/pci_type.h>
uint64_t ecam0_get_bar_val(pci_devfn_t dev, u8 bar);
-#else
-#include <device/device.h>
-
-uint64_t ecam0_get_bar_val(struct device *dev, u8 bar);
-#endif
#endif