Nico Huber has uploaded this change for review.

View Change

device: Rename scan_static_bus() -> enable_static_devices()

The new name should reflect better what this function does, as that
is only one specific step of the scanning.

Change-Id: I9c9dc437b6117112bb28550855a2c38044dfbfa5
Signed-off-by: Nico Huber <nico.huber@secunet.com>
---
M src/device/root_device.c
M src/include/device/device.h
M src/soc/intel/common/block/dsp/dsp.c
M src/soc/intel/common/block/hda/hda.c
4 files changed, 8 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31900/1

diff --git a/src/device/root_device.c b/src/device/root_device.c
index f8e2907..8f2d446 100644
--- a/src/device/root_device.c
+++ b/src/device/root_device.c
@@ -26,7 +26,7 @@
 const char mainboard_name[] = CONFIG_MAINBOARD_VENDOR " " CONFIG_MAINBOARD_PART_NUMBER;
 
 /**
- * Scan devices on static buses.
+ * Enable devices on static buses.
  *
  * The enumeration of certain buses is purely static. The existence of
  * devices on those buses can be completely determined at compile time
@@ -43,7 +43,7 @@
  * @param bus Pointer to the device to which the static buses are attached to.
  */
 
-void scan_static_bus(struct device *bus)
+void enable_static_devices(struct device *bus)
 {
 	struct device *child;
 	struct bus *link;
@@ -67,7 +67,7 @@
 {
 	printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus));
 
-	scan_static_bus(bus);
+	enable_static_devices(bus);
 
 	printk(BIOS_SPEW, "%s for %s done\n", __func__, dev_path(bus));
 }
@@ -78,7 +78,7 @@
 
 	printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus));
 
-	scan_static_bus(bus);
+	enable_static_devices(bus);
 
 	/* Scan bridges in case this device is a hub */
 	for (link = bus->link_list; link; link = link->next)
@@ -136,7 +136,7 @@
 
 	printk(BIOS_SPEW, "%s for %s\n", __func__, dev_path(bus));
 
-	scan_static_bus(bus);
+	enable_static_devices(bus);
 
 	for (link = bus->link_list; link; link = link->next)
 		scan_bridges(link);
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 2e2cda9..cbee197 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -278,9 +278,9 @@
 DEVTREE_CONST struct device *pcidev_path_on_root(pci_devfn_t devfn);
 DEVTREE_CONST struct device *pcidev_on_root(uint8_t dev, uint8_t fn);
 
+void enable_static_devices(struct device *bus);
 void scan_smbus(struct device *bus);
 void scan_generic_bus(struct device *bus);
-void scan_static_bus(struct device *bus);
 void scan_lpc_bus(struct device *bus);
 void scan_usb_bus(struct device *bus);
 
diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c
index 2bd6599..7f7eb90 100644
--- a/src/soc/intel/common/block/dsp/dsp.c
+++ b/src/soc/intel/common/block/dsp/dsp.c
@@ -23,7 +23,7 @@
 	.set_resources          = pci_dev_set_resources,
 	.enable_resources       = pci_dev_enable_resources,
 	.ops_pci                = &pci_dev_ops_pci,
-	.scan_bus               = scan_static_bus,
+	.scan_bus               = enable_static_devices,
 };
 
 static const unsigned short pci_device_ids[] = {
diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c
index 8ab835e..c1426e0 100644
--- a/src/soc/intel/common/block/hda/hda.c
+++ b/src/soc/intel/common/block/hda/hda.c
@@ -69,7 +69,7 @@
 	.init			= hda_init,
 #endif
 	.ops_pci		= &pci_dev_ops_pci,
-	.scan_bus		= scan_static_bus,
+	.scan_bus		= enable_static_devices,
 };
 
 static const unsigned short pci_device_ids[] = {

To view, visit change 31900. To unsubscribe, or for help writing mail filters, visit settings.