Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/28047
Change subject: src/device/pci_early.c: Remove deprecated device_t ......................................................................
src/device/pci_early.c: Remove deprecated device_t
Use of device_t has been abandoned in ramstage. Use pci_devfn_t or pnp_devfn_t instead of device_t in romstage.
Change-Id: I30086d48a573e76f6dd577a3510fde3f50bd25c4 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/device/pci_early.c 1 file changed, 15 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/28047/1
diff --git a/src/device/pci_early.c b/src/device/pci_early.c index 6baebe0..34ed893 100644 --- a/src/device/pci_early.c +++ b/src/device/pci_early.c @@ -13,8 +13,6 @@ * GNU General Public License for more details. */
-#define __SIMPLE_DEVICE__ - #include <arch/io.h> #include <device/pci.h> #include <device/pci_def.h> @@ -72,8 +70,11 @@
#if IS_ENABLED(CONFIG_EARLY_PCI_BRIDGE) - -static void pci_bridge_reset_secondary(device_t p2p_bridge) +#ifdef __PRE_RAM__ +static void pci_bridge_reset_secondary(pci_devfn_t p2p_bridge) +#else +static void pci_bridge_reset_secondary(struct device *p2p_bridge) +#endif { u16 reg16;
@@ -90,7 +91,11 @@ pci_write_config16(p2p_bridge, PCI_BRIDGE_CONTROL, reg16); }
-static void pci_bridge_set_secondary(device_t p2p_bridge, u8 secondary) +#ifdef __PRE_RAM__ +static void pci_bridge_set_secondary(pci_devfn_t p2p_bridge, u8 secondary) +#else +static void pci_bridge_set_secondary(struct device *p2p_bridge, u8 secondary) +#endif { /* Disable config transaction forwarding. */ pci_write_config8(p2p_bridge, PCI_SECONDARY_BUS, 0x00); @@ -100,7 +105,11 @@ pci_write_config8(p2p_bridge, PCI_SUBORDINATE_BUS, secondary); }
-static void pci_bridge_set_mmio(device_t p2p_bridge, u32 base, u32 size) +#ifdef __PRE_RAM__ +static void pci_bridge_set_mmio(pci_devfn_t p2p_bridge, u32 base, u32 size) +#else +static void pci_bridge_set_mmio(struct device *p2p_bridge, u32 base, u32 size) +#endif { u16 reg16;