device/device.h: Rename busses for clarity

This renames bus to upstream and link_list to downstream.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I80a81b6b8606e450ff180add9439481ec28c2420
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78330
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

3 files changed, 13 insertions, 13 deletions

diff --git a/src/superio/common/generic.c b/src/superio/common/generic.c
index 1758accbff..92d835731e 100644
--- a/src/superio/common/generic.c
+++ b/src/superio/common/generic.c
@@ -13,8 +13,8 @@ static void generic_set_resources(struct device *dev)
 	if (!dev)
 		return;
 
-	if (dev->link_list)
-		assign_resources(dev->link_list);
+	if (dev->downstream)
+		assign_resources(dev->downstream);
 
 	for (res = dev->resource_list; res; res = res->next) {
 		if (!(res->flags & IORESOURCE_ASSIGNED))
@@ -159,8 +159,8 @@ static void generic_ssdt(const struct device *dev)
 		acpigen_write_acquire(mutex, 0xffff);
 
 		/* Pick one of the children as the generic SIO doesn't have config mode */
-		if (dev->link_list && dev->link_list->children)
-			pnp_ssdt_enter_conf_mode(dev->link_list->children, "^INDX", "^DATA");
+		if (dev->downstream && dev->downstream->children)
+			pnp_ssdt_enter_conf_mode(dev->downstream->children, "^INDX", "^DATA");
 
 		/* Backup LDN */
 		acpigen_write_store();
@@ -178,8 +178,8 @@ static void generic_ssdt(const struct device *dev)
 		acpigen_emit_namestring("^LDN");
 
 		/* Pick one of the children as the generic SIO doesn't have config mode */
-		if (dev->link_list && dev->link_list->children)
-			pnp_ssdt_exit_conf_mode(dev->link_list->children, "^INDX", "^DATA");
+		if (dev->downstream && dev->downstream->children)
+			pnp_ssdt_exit_conf_mode(dev->downstream->children, "^INDX", "^DATA");
 
 		acpigen_write_release(mutex);
 	}
diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c
index 47fbf0cb8e..fd55792f0a 100644
--- a/src/superio/common/ssdt.c
+++ b/src/superio/common/ssdt.c
@@ -161,7 +161,7 @@ static const char *name_from_hid(const char *hid)
 
 void superio_common_fill_ssdt_generator(const struct device *dev)
 {
-	if (!dev || !dev->bus || !dev->bus->dev) {
+	if (!dev || !dev->upstream || !dev->upstream->dev) {
 		printk(BIOS_CRIT, "BUG: Invalid argument in %s!\n", __func__);
 		return;
 	}
@@ -174,11 +174,11 @@ void superio_common_fill_ssdt_generator(const struct device *dev)
 
 	/* Validate devicetree settings */
 	bool bug = false;
-	if (dev->bus->dev->path.type != DEVICE_PATH_PNP) {
+	if (dev->upstream->dev->path.type != DEVICE_PATH_PNP) {
 		bug = true;
 		printk(BIOS_CRIT, "BUG: Parent of device %s is not a PNP device\n",
 			dev_path(dev));
-	} else if (dev->bus->dev->path.pnp.port != dev->path.pnp.port) {
+	} else if (dev->upstream->dev->path.pnp.port != dev->path.pnp.port) {
 		bug = true;
 		printk(BIOS_CRIT, "BUG: Parent of device %s has wrong I/O port\n",
 			dev_path(dev));
diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c
index a4759fb721..ddf63cdb72 100644
--- a/src/superio/nuvoton/npcd378/superio.c
+++ b/src/superio/nuvoton/npcd378/superio.c
@@ -356,7 +356,7 @@ static void npcd378_ssdt_pwr(const struct device *dev)
 	/* Method (SIOH, 0, NotSerialized) */
 	acpigen_write_method("_L08", 0);
 	acpigen_emit_byte(AND_OP);
-	acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG"));
+	acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "PMFG"));
 	acpigen_write_integer(0xE8);
 	acpigen_emit_byte(LOCAL0_OP);
 
@@ -366,13 +366,13 @@ static void npcd378_ssdt_pwr(const struct device *dev)
 	acpigen_emit_byte(ZERO_OP);
 
 	acpigen_emit_byte(NOTIFY_OP);
-	acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L060"));
+	acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "L060"));
 	acpigen_write_integer(2);
 
 	acpigen_pop_len();		/* Pop If */
 
 	acpigen_emit_byte(AND_OP);
-	acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG"));
+	acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "PMFG"));
 	acpigen_write_integer(0x10);
 	acpigen_emit_byte(LOCAL0_OP);
 
@@ -382,7 +382,7 @@ static void npcd378_ssdt_pwr(const struct device *dev)
 	acpigen_emit_byte(ZERO_OP);
 
 	acpigen_emit_byte(NOTIFY_OP);
-	acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L050"));
+	acpigen_emit_namestring(acpi_device_path_join(dev->upstream->dev, "L050"));
 	acpigen_write_integer(2);
 	acpigen_pop_len();		/* Pop If */