7 files changed, 9 insertions, 9 deletions

diff --git a/src/mainboard/google/brox/mainboard.c b/src/mainboard/google/brox/mainboard.c
index f892099be8..5820805a97 100644
--- a/src/mainboard/google/brox/mainboard.c
+++ b/src/mainboard/google/brox/mainboard.c
@@ -106,7 +106,7 @@ static void mainboard_dev_init(struct device *dev)
 static void mainboard_generate_wwan_shutdown(const struct device *dev)
 {
 	const struct drivers_wwan_fm_config *config = config_of(dev);
-	const struct device *parent = dev->bus->dev;
+	const struct device *parent = dev->upstream->dev;
 
 	if (!config)
 		return;
@@ -126,7 +126,7 @@ static void mainboard_generate_wwan_shutdown(const struct device *dev)
 static void mainboard_generate_dgpu_shutdown(const struct device *dev)
 {
 	/* Call `_OFF` from the Power Resource associated with the dGPU's PEG port. */
-	const struct device *parent = dev->bus->dev;
+	const struct device *parent = dev->upstream->dev;
 
 	if (parent)
 		acpigen_emit_namestring(acpi_device_path_join(parent, "PGPR._OFF"));
diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c
index aa332cd806..9cf56b2402 100644
--- a/src/mainboard/google/brya/mainboard.c
+++ b/src/mainboard/google/brya/mainboard.c
@@ -106,7 +106,7 @@ static void mainboard_dev_init(struct device *dev)
 static void mainboard_generate_wwan_shutdown(const struct device *dev)
 {
 	const struct drivers_wwan_fm_config *config = config_of(dev);
-	const struct device *parent = dev->bus->dev;
+	const struct device *parent = dev->upstream->dev;
 
 	if (!config)
 		return;
@@ -126,7 +126,7 @@ static void mainboard_generate_wwan_shutdown(const struct device *dev)
 static void mainboard_generate_dgpu_shutdown(const struct device *dev)
 {
 	/* Call `_OFF` from the Power Resource associated with the dGPU's PEG port. */
-	const struct device *parent = dev->bus->dev;
+	const struct device *parent = dev->upstream->dev;
 
 	if (parent)
 		acpigen_emit_namestring(acpi_device_path_join(parent, "PGPR._OFF"));
diff --git a/src/mainboard/google/kahlee/variants/careena/mainboard.c b/src/mainboard/google/kahlee/variants/careena/mainboard.c
index 937a4113ce..c54b5303a5 100644
--- a/src/mainboard/google/kahlee/variants/careena/mainboard.c
+++ b/src/mainboard/google/kahlee/variants/careena/mainboard.c
@@ -26,7 +26,7 @@ void variant_devtree_update(void)
 	if (mmio_dev == NULL)
 		return;
 
-	while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) {
+	while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) {
 		if (child->path.type != DEVICE_PATH_I2C)
 			continue;
 		if (child->path.i2c.device != 0x1a)
diff --git a/src/mainboard/google/kahlee/variants/treeya/audio.c b/src/mainboard/google/kahlee/variants/treeya/audio.c
index ac7f7a2729..e7a20ea414 100644
--- a/src/mainboard/google/kahlee/variants/treeya/audio.c
+++ b/src/mainboard/google/kahlee/variants/treeya/audio.c
@@ -25,7 +25,7 @@ void variant_devtree_update(void)
 		}
 	} while (mmio_dev->path.mmio.addr != APU_I2C0_BASE);
 
-	while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) {
+	while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) {
 		if (child->path.type != DEVICE_PATH_I2C)
 			continue;
 		if (child->path.i2c.device != RT58_I2C_ADDRESS)
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index 92b107479d..3392a3c990 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -179,7 +179,7 @@ static void audio_codec_device_update(void)
 {
 	struct device *audio_dev = NULL;
 	struct bus *audio_i2c_bus =
-		pcidev_path_on_root(PCH_DEVFN_I2C5)->link_list;
+		pcidev_path_on_root(PCH_DEVFN_I2C5)->downstream;
 	enum ssfc_audio_codec codec = ssfc_get_audio_codec();
 
 	while ((audio_dev = dev_bus_each_child(audio_i2c_bus, audio_dev))) {
diff --git a/src/mainboard/google/rex/mainboard.c b/src/mainboard/google/rex/mainboard.c
index 3ca85ff77c..bf489ff528 100644
--- a/src/mainboard/google/rex/mainboard.c
+++ b/src/mainboard/google/rex/mainboard.c
@@ -82,7 +82,7 @@ static void mainboard_generate_s0ix_hook(void)
 static void mainboard_generate_wwan_shutdown(const struct device *dev)
 {
 	const struct drivers_wwan_fm_config *config = config_of(dev);
-	const struct device *parent = dev->bus->dev;
+	const struct device *parent = dev->upstream->dev;
 
 	if (!config)
 		return;
diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
index 3c203f5442..a544548961 100644
--- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
+++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
@@ -115,7 +115,7 @@ void variant_touchscreen_update(void)
 	if (variant_uses_v3_6_schematics())
 		return;
 
-	while ((child = dev_bus_each_child(mmio_dev->link_list, child)) != NULL) {
+	while ((child = dev_bus_each_child(mmio_dev->downstream, child)) != NULL) {
 		struct drivers_i2c_generic_config *cfg;
 
 		if (child->chip_ops == &drivers_i2c_generic_ops) {