- Rename UPA_BUS_SPACE to NEXUS_BUS_SPACE; besides an UPA bus, nexus(4)

  may also reflect a Fireplane/Safari or JBus bus (or a virtual bus which
  in turn reflects a JBus bus or something like that...).
- In the both the sparc64 and sun4v bus_machdep.c use __FBSDID.
- Spell SBus the official way in comments.
- Replace hardcoded function names (all of which were actually outdated)
  in panic and status strings with __func__.
- Fix whitespace nits.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/sparc64/sparc64/ofw_machdep.c b/sys/sparc64/sparc64/ofw_machdep.c
index 05c4437401fa..7efc807e28b7 100644
--- a/sys/sparc64/sparc64/ofw_machdep.c
+++ b/sys/sparc64/sparc64/ofw_machdep.c
@@ -245,14 +245,14 @@ OF_decode_addr(phandle_t node, int bank, int *space, bus_addr_t *addr)
 	/* Done with mapping. Return the bus space as used by FreeBSD. */
 	*addr = start;
 	if (OF_parent(lbus) == 0) {
-		*space = UPA_BUS_SPACE;
+		*space = NEXUS_BUS_SPACE;
 		return (0);
 	}
 	if (OF_getprop(lbus, "name", name, sizeof(name)) == -1)
 		return (ENXIO);
 	name[sizeof(name) - 1] = '\0';
 	if (strcmp(name, "central") == 0 || strcmp(name, "upa") == 0) {
-		*space = UPA_BUS_SPACE;
+		*space = NEXUS_BUS_SPACE;
 		return (0);
 	} else if (strcmp(name, "pci") == 0) {
 		switch (cspace) {