From e7377556cc33b10fdba6d956ac83d823478f5eb4 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 21 Jun 2018 16:20:55 +0300 Subject: device: Use pcidev_path_on_root() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2e28b9f4ecaf258bff8a062b5a54cb3d8e2bb9b0 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/30400 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/google/kahlee/OemCustomize.c | 2 +- src/mainboard/google/octopus/mainboard.c | 4 ++-- src/mainboard/google/octopus/variants/phaser/variant.c | 2 +- src/mainboard/google/poppy/variants/atlas/gpio.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/kahlee/OemCustomize.c b/src/mainboard/google/kahlee/OemCustomize.c index ce70b8d6e3..5c480bf49f 100644 --- a/src/mainboard/google/kahlee/OemCustomize.c +++ b/src/mainboard/google/kahlee/OemCustomize.c @@ -79,7 +79,7 @@ void OemPostParams(AMD_POST_PARAMS *PostParams) void set_board_env_params(GNB_ENV_CONFIGURATION *params) { const struct soc_amd_stoneyridge_config *cfg; - const struct device *dev = dev_find_slot(0, GNB_DEVFN); + const struct device *dev = pcidev_path_on_root(GNB_DEVFN); if (!dev || !dev->chip_info) { printk(BIOS_WARNING, "Warning: Cannot find SoC devicetree config\n"); return; diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 57a614ee34..5b011c8f19 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -36,7 +36,7 @@ static bool is_cnvi_held_in_reset(void) { - struct device *dev = dev_find_slot(0, PCH_DEVFN_CNVI); + struct device *dev = pcidev_path_on_root(PCH_DEVFN_CNVI); uint32_t reg = pci_read_config32(dev, PCI_VENDOR_ID); /* @@ -167,7 +167,7 @@ static void wifi_device_update(void) else devfn = PCH_DEVFN_PCIE1; - dev = dev_find_slot(0, devfn); + dev = pcidev_path_on_root(devfn); if (dev) dev->enabled = 0; } diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c index 724dd13251..22f4f71b92 100644 --- a/src/mainboard/google/octopus/variants/phaser/variant.c +++ b/src/mainboard/google/octopus/variants/phaser/variant.c @@ -25,7 +25,7 @@ void variant_update_devtree(struct device *dev) uint32_t sku_id = SKU_UNKNOWN; struct device *touchscreen_i2c_host; - touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7); + touchscreen_i2c_host = pcidev_path_on_root(PCH_DEVFN_I2C7); if (touchscreen_i2c_host == NULL) return; diff --git a/src/mainboard/google/poppy/variants/atlas/gpio.c b/src/mainboard/google/poppy/variants/atlas/gpio.c index 02c145c624..4de65d4950 100644 --- a/src/mainboard/google/poppy/variants/atlas/gpio.c +++ b/src/mainboard/google/poppy/variants/atlas/gpio.c @@ -419,7 +419,7 @@ static const struct pad_config ish_disabled_gpio_table[] = { const struct pad_config *variant_sku_gpio_table(size_t *num) { const struct pad_config *board_gpio_tables; - const struct device *dev = dev_find_slot(0, PCH_DEVFN_ISH); + const struct device *dev = pcidev_path_on_root(PCH_DEVFN_ISH); if (dev && dev->enabled) { *num = ARRAY_SIZE(ish_enabled_gpio_table); board_gpio_tables = ish_enabled_gpio_table; -- cgit v1.2.3