From c70eed1e6202c928803f3e7f79161cd247a62b23 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 22 May 2018 02:18:00 +0300 Subject: device: Use pcidev_on_root() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf34b39d80f6e46d32a39b68f38fb2752c0bcebc Signed-off-by: Kyösti Mälkki Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/26484 Tested-by: build bot (Jenkins) Reviewed-by: Piotr Król Reviewed-by: Arthur Heymans --- src/soc/intel/braswell/chip.c | 4 ++-- src/soc/intel/braswell/pmutil.c | 2 +- src/soc/intel/braswell/ramstage.c | 2 +- src/soc/intel/braswell/romstage/romstage.c | 2 +- src/soc/intel/braswell/spi.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/soc/intel/braswell') diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c index ccd6c9fe41..7a63b5b715 100644 --- a/src/soc/intel/braswell/chip.c +++ b/src/soc/intel/braswell/chip.c @@ -86,7 +86,7 @@ __weak void board_silicon_USB2_override(SILICON_INIT_UPD *params) void soc_silicon_init_params(SILICON_INIT_UPD *params) { - struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC); struct soc_intel_braswell_config *config; if (!dev) { @@ -406,7 +406,7 @@ struct pci_operations soc_pci_ops = { **/ int SocStepping(void) { - struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC); u8 revid = pci_read_config8(dev, 0x8); switch (revid & B_PCH_LPC_RID_STEPPING_MASK) { diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index 85384a6120..8dbb499202 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/src/soc/intel/braswell/pmutil.c @@ -44,7 +44,7 @@ static struct device *pcu_dev; static struct device *get_pcu_dev(void) { if (pcu_dev == NULL) - pcu_dev = dev_find_slot(0, PCI_DEVFN(PCU_DEV, 0)); + pcu_dev = pcidev_on_root(PCU_DEV, 0); return pcu_dev; } #endif /* ENV_SMM */ diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index a12db8034d..b8362cdc58 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -84,7 +84,7 @@ static void fill_in_pattrs(void) struct pattrs *attrs = (struct pattrs *)pattrs_get(); attrs->cpuid = cpuid_eax(1); - dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + dev = pcidev_on_root(LPC_DEV, LPC_FUNC); attrs->revid = pci_read_config8(dev, REVID); /* The revision to stepping IDs have two values per metal stepping. */ if (attrs->revid >= RID_D_STEPPING_START) { diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c index 14eaa6b3a8..9b9a0eba5d 100644 --- a/src/soc/intel/braswell/romstage/romstage.c +++ b/src/soc/intel/braswell/romstage/romstage.c @@ -216,7 +216,7 @@ void soc_memory_init_params(struct romstage_params *params, const struct soc_intel_braswell_config *config; /* Set the parameters for MemoryInit */ - dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + dev = pcidev_on_root(LPC_DEV, LPC_FUNC); if (!dev) { printk(BIOS_ERR, diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c index a5f835d55a..988832d09d 100644 --- a/src/soc/intel/braswell/spi.c +++ b/src/soc/intel/braswell/spi.c @@ -236,7 +236,7 @@ static ich9_spi_regs *spi_regs(void) #if ENV_SMM pci_devfn_t dev = PCI_DEV(0, LPC_DEV, LPC_FUNC); #else - struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC)); + struct device *dev = pcidev_on_root(LPC_DEV, LPC_FUNC); #endif if (!dev) { printk(BIOS_ERR, "%s: PCI device not found", __func__); -- cgit v1.2.3