From 5a4d072c935fd9f088f3c1fae3c8dbff55ad7e65 Mon Sep 17 00:00:00 2001
From: Nate Lawson <njl@FreeBSD.org>
Date: Thu, 28 Aug 2003 16:30:31 +0000
Subject: [PATCH] Minor style cleanups.

---
 sys/amd64/acpica/OsdEnvironment.c |  2 +-
 sys/amd64/acpica/acpi_machdep.c   |  3 +--
 sys/amd64/acpica/acpi_wakeup.c    |  1 -
 sys/ia64/acpica/OsdEnvironment.c  | 13 +++++--------
 sys/ia64/acpica/acpi_machdep.c    |  4 +---
 sys/ia64/acpica/acpi_wakeup.c     |  2 --
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index 477363b6d18..63216b7ed74 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 u_long amd64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
-    "The physical address of the RSDP");
+	     "The physical address of the RSDP");
 
 ACPI_STATUS
 AcpiOsInitialize(void)
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 09ae3d0b5b5..1893449ff2a 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -38,9 +38,8 @@ acpi_machdep_init(device_t dev)
 {
 	struct	acpi_softc *sc;
 
-	if ((sc = device_get_softc(dev)) == NULL) {
+	if ((sc = device_get_softc(dev)) == NULL)
 		return (ENXIO);
-	}
 
 	acpi_install_wakeup_handler(sc);
 
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 06cf0526b77..a82fbcd3c6a 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
-
 	return (0);
 }
 
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index e4e664ee433..bac558f9625 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -42,42 +42,39 @@ extern u_int64_t ia64_efi_acpi20_table;
 u_long ia64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &ia64_acpi_root, 0,
-    "The physical address of the RSDP");
+	     "The physical address of the RSDP");
 
 ACPI_STATUS
 AcpiOsInitialize(void)
 {
-
 	return(NULL);
 }
 
 ACPI_STATUS
 AcpiOsTerminate(void)
 {
-
 	return(NULL);
 }
 
 ACPI_STATUS
 AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpAddress)
 {
-
 	if (ia64_acpi_root == 0) {
 		if (ia64_efi_acpi20_table) {
 			/* XXX put under bootverbose. */
 			printf("Using ACPI2.0 table at 0x%lx\n",
-			    ia64_efi_acpi20_table);
+			       ia64_efi_acpi20_table);
 			ia64_acpi_root = ia64_efi_acpi20_table;
 		} else if (ia64_efi_acpi_table) {
 			/* XXX put under bootverbose. */
 			printf("Using ACPI1.x table at 0x%lx\n",
-			    ia64_efi_acpi_table);
+			       ia64_efi_acpi_table);
 			ia64_acpi_root = ia64_efi_acpi_table;
 		} else
-			return(AE_NOT_FOUND);
+			return (AE_NOT_FOUND);
 	}
 
 	RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER;
 	RsdpAddress->Pointer.Physical = ia64_acpi_root;
-	return(AE_OK);
+	return (AE_OK);
 }
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
index 499a620571a..7085ba7b78d 100644
--- a/sys/ia64/acpica/acpi_machdep.c
+++ b/sys/ia64/acpica/acpi_machdep.c
@@ -37,12 +37,10 @@ acpi_machdep_init(device_t dev)
 {
 	struct	acpi_softc *sc;
 
-        if ((sc = device_get_softc(dev)) == NULL) {
+        if ((sc = device_get_softc(dev)) == NULL)
                 return (ENXIO);
-        }
 
 	acpi_install_wakeup_handler(sc);
 
 	return (0);
 }
-
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
index 8ec4df44575..1382acc93fe 100644
--- a/sys/ia64/acpica/acpi_wakeup.c
+++ b/sys/ia64/acpica/acpi_wakeup.c
@@ -35,7 +35,6 @@
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
-
 	return (0);
 }
 
@@ -43,4 +42,3 @@ void
 acpi_install_wakeup_handler(struct acpi_softc *sc)
 {
 }
-