From e5742fbd97dedfd787e43333001fa72fb99f50c9 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Fri, 23 Aug 2024 18:07:25 +0200 Subject: soc/cavium: Fix non matching types There is no struct device *dev equivalent of this function. Clang LTO warns about mismatching types. Change-Id: I22c8c9b9f350c53469a5d386db211969c8a41cf0 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/84084 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/soc/cavium/cn81xx/ecam0.c | 2 +- src/soc/cavium/common/include/soc/ecam.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'src') 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 uint64_t ecam0_get_bar_val(pci_devfn_t dev, u8 bar); -#else -#include - -uint64_t ecam0_get_bar_val(struct device *dev, u8 bar); -#endif #endif -- cgit v1.2.3