cleanup: Remove checkpatch warnings

This make minor syntactic changes and renames some camel-cased symbols
to keep checkpatch from complaining.  The goal is to reduce the
temptation to use 'repo upload --no-verify'.

This is a big furball of find/replace, but no functional changes.

BUG=chromium:322144
BRANCH=none
TEST=build all boards; pass unit tests

Change-Id: I0269b7dd95836ef9a6e33f88c003ab0f24f842a0
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/180495

5 files changed, 39 insertions, 41 deletions

diff --git a/power/baytrail.c b/power/baytrail.c
index b353d658a7..203c63707b 100644
--- a/power/baytrail.c
+++ b/power/baytrail.c
@@ -28,8 +28,8 @@
 #define IN_PGOOD_PP1050            X86_SIGNAL_MASK(X86_PGOOD_PP1050)
 #define IN_PGOOD_S5                X86_SIGNAL_MASK(X86_PGOOD_S5)
 #define IN_PGOOD_VCORE             X86_SIGNAL_MASK(X86_PGOOD_VCORE)
-#define IN_PCH_SLP_S3n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S3n_DEASSERTED)
-#define IN_PCH_SLP_S4n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S4n_DEASSERTED)
+#define IN_SLP_S3_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S3_DEASSERTED)
+#define IN_SLP_S4_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S4_DEASSERTED)
 
 /* All always-on supplies */
 #define IN_PGOOD_ALWAYS_ON   (IN_PGOOD_S5)
@@ -43,8 +43,7 @@
 #define IN_PGOOD_S0          (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE)
 
 /* All PM_SLP signals from PCH deasserted */
-#define IN_ALL_PM_SLP_DEASSERTED (IN_PCH_SLP_S3n_DEASSERTED |		\
-				  IN_PCH_SLP_S4n_DEASSERTED)
+#define IN_ALL_PM_SLP_DEASSERTED (IN_SLP_S3_DEASSERTED | IN_SLP_S4_DEASSERTED)
 /* All inputs in the right state for S0 */
 #define IN_ALL_S0 (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE |		\
 		   IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED)
diff --git a/power/gaia.c b/power/gaia.c
index b928a00719..0726198a2b 100644
--- a/power/gaia.c
+++ b/power/gaia.c
@@ -322,17 +322,17 @@ static int gaia_power_init(void)
 
 #ifdef BOARD_PIT
        /*
-        * Force the AP into reset unless we're doing a sysjump.  Otherwise a
-        * suspended AP may still be in a strange state from the last reboot,
-        * and will hold XPSHOLD for a long time if it's in a low power state.
-        * See crosbug.com/p/22233.
-        */
-       if (!(system_get_reset_flags() & RESET_FLAG_SYSJUMP)) {
-               CPRINTF("[%T not sysjump; forcing AP reset]\n");
-               gpio_set_level(GPIO_AP_RESET_L, 0);
-               udelay(1000);
-               gpio_set_level(GPIO_AP_RESET_L, 1);
-       }
+	* Force the AP into reset unless we're doing a sysjump.  Otherwise a
+	* suspended AP may still be in a strange state from the last reboot,
+	* and will hold XPSHOLD for a long time if it's in a low power state.
+	* See crosbug.com/p/22233.
+	*/
+	if (!(system_get_reset_flags() & RESET_FLAG_SYSJUMP)) {
+		CPRINTF("[%T not sysjump; forcing AP reset]\n");
+		gpio_set_level(GPIO_AP_RESET_L, 0);
+		udelay(1000);
+		gpio_set_level(GPIO_AP_RESET_L, 1);
+	}
 #endif
 
 	return EC_SUCCESS;
@@ -409,13 +409,13 @@ void chipset_force_shutdown(void)
 #endif
 
 #ifdef BOARD_PIT
-       /*
-        * Force the AP into reset.  Otherwise it will hold XPSHOLD for a long
-        * time if it's in a low power state.  See crosbug.com/p/22233.
-        */
-       gpio_set_level(GPIO_AP_RESET_L, 0);
-       udelay(1000);
-       gpio_set_level(GPIO_AP_RESET_L, 1);
+	/*
+	 * Force the AP into reset.  Otherwise it will hold XPSHOLD for a long
+	 * time if it's in a low power state.  See crosbug.com/p/22233.
+	 */
+	gpio_set_level(GPIO_AP_RESET_L, 0);
+	udelay(1000);
+	gpio_set_level(GPIO_AP_RESET_L, 1);
 #endif
 }
 
diff --git a/power/haswell.c b/power/haswell.c
index 4bc83c5ff6..cd00300f25 100644
--- a/power/haswell.c
+++ b/power/haswell.c
@@ -28,10 +28,10 @@
 #define IN_PGOOD_PP1350            X86_SIGNAL_MASK(X86_PGOOD_PP1350)
 #define IN_PGOOD_PP1050            X86_SIGNAL_MASK(X86_PGOOD_PP1050)
 #define IN_PGOOD_VCORE             X86_SIGNAL_MASK(X86_PGOOD_VCORE)
-#define IN_PCH_SLP_S0n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S0n_DEASSERTED)
-#define IN_PCH_SLP_S3n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S3n_DEASSERTED)
-#define IN_PCH_SLP_S5n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S5n_DEASSERTED)
-#define IN_PCH_SLP_SUSn_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_SUSn_DEASSERTED)
+#define IN_SLP_S0_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S0_DEASSERTED)
+#define IN_SLP_S3_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S3_DEASSERTED)
+#define IN_SLP_S5_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S5_DEASSERTED)
+#define IN_SLP_SUS_DEASSERTED      X86_SIGNAL_MASK(X86_SLP_SUS_DEASSERTED)
 
 /* All always-on supplies */
 #define IN_PGOOD_ALWAYS_ON   (IN_PGOOD_PP5000)
@@ -45,8 +45,8 @@
 #define IN_PGOOD_S0          (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE)
 
 /* All PM_SLP signals from PCH deasserted */
-#define IN_ALL_PM_SLP_DEASSERTED (IN_PCH_SLP_S3n_DEASSERTED |		\
-				  IN_PCH_SLP_S5n_DEASSERTED)
+#define IN_ALL_PM_SLP_DEASSERTED (IN_SLP_S3_DEASSERTED |	\
+				  IN_SLP_S5_DEASSERTED)
 /* All inputs in the right state for S0 */
 #define IN_ALL_S0 (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE |		\
 		   IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED)
@@ -206,7 +206,7 @@ enum x86_state x86_handle_state(enum x86_state state)
 
 		/* Assert DPWROK */
 		gpio_set_level(GPIO_PCH_DPWROK, 1);
-		if (x86_wait_signals(IN_PCH_SLP_SUSn_DEASSERTED)) {
+		if (x86_wait_signals(IN_SLP_SUS_DEASSERTED)) {
 			chipset_force_shutdown();
 			return X86_G3;
 		}
diff --git a/power/ivybridge.c b/power/ivybridge.c
index 7a8dfd12aa..3a3c344223 100644
--- a/power/ivybridge.c
+++ b/power/ivybridge.c
@@ -30,12 +30,12 @@
 #define IN_PGOOD_VCCSA             X86_SIGNAL_MASK(X86_PGOOD_VCCSA)
 #define IN_PGOOD_CPU_CORE          X86_SIGNAL_MASK(X86_PGOOD_CPU_CORE)
 #define IN_PGOOD_VGFX_CORE         X86_SIGNAL_MASK(X86_PGOOD_VGFX_CORE)
-#define IN_PCH_SLP_S3n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S3n_DEASSERTED)
-#define IN_PCH_SLP_S4n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S4n_DEASSERTED)
-#define IN_PCH_SLP_S5n_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_S5n_DEASSERTED)
-#define IN_PCH_SLP_An_DEASSERTED   X86_SIGNAL_MASK(X86_PCH_SLP_An_DEASSERTED)
-#define IN_PCH_SLP_SUSn_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_SUSn_DEASSERTED)
-#define IN_PCH_SLP_MEn_DEASSERTED  X86_SIGNAL_MASK(X86_PCH_SLP_MEn_DEASSERTED)
+#define IN_SLP_S3_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S3_DEASSERTED)
+#define IN_SLP_S4_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S4_DEASSERTED)
+#define IN_SLP_S5_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_S5_DEASSERTED)
+#define IN_SLP_A_DEASSERTED        X86_SIGNAL_MASK(X86_SLP_A_DEASSERTED)
+#define IN_SLP_SUS_DEASSERTED      X86_SIGNAL_MASK(X86_SLP_SUS_DEASSERTED)
+#define IN_SLP_ME_DEASSERTED       X86_SIGNAL_MASK(X86_SLP_ME_DEASSERTED)
 
 /* All always-on supplies */
 #define IN_PGOOD_ALWAYS_ON   (IN_PGOOD_5VALW)
@@ -50,10 +50,10 @@
 #define IN_PGOOD_S0          (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE)
 
 /* All PM_SLP signals from PCH deasserted */
-#define IN_ALL_PM_SLP_DEASSERTED (IN_PCH_SLP_S3n_DEASSERTED |		\
-				  IN_PCH_SLP_S4n_DEASSERTED |		\
-				  IN_PCH_SLP_S5n_DEASSERTED |		\
-				  IN_PCH_SLP_An_DEASSERTED)
+#define IN_ALL_PM_SLP_DEASSERTED (IN_SLP_S3_DEASSERTED |		\
+				  IN_SLP_S4_DEASSERTED |		\
+				  IN_SLP_S5_DEASSERTED |		\
+				  IN_SLP_A_DEASSERTED)
 /* All inputs in the right state for S0 */
 #define IN_ALL_S0 (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE |		\
 		   IN_PGOOD_CPU_CORE | IN_ALL_PM_SLP_DEASSERTED)
diff --git a/power/tegra.c b/power/tegra.c
index c808b494d6..6e9960e7d3 100644
--- a/power/tegra.c
+++ b/power/tegra.c
@@ -438,9 +438,8 @@ static int check_for_power_on_event(void)
 	}
 
 	/* check for power button press */
-	if (power_button_is_pressed()) {
+	if (power_button_is_pressed())
 		return 4;
-	}
 
 	if (power_request == POWER_REQ_ON) {
 		power_request = POWER_REQ_NONE;