arch/x86: Fix most of remaining issues detected by checkpatch

Fix the following errors and warnings detected by checkpatch.pl:

ERROR: do not use assignment in if condition
ERROR: trailing statements should be on next line
ERROR: Macros with complex values should be enclosed in parentheses
ERROR: switch and case should be at the same indent
WARNING: char * array declaration might be better as static const
WARNING: else is not generally useful after a break or return
WARNING: storage class should be at the beginning of the declaration
WARNING: void function return statements are not generally useful
WARNING: break is not useful after a goto or return
WARNING: Single statement macros should not use a do {} while (0) loop
WARNING: sizeof *t should be sizeof(*t)
WARNING: Comparisons should place the constant on the right side of the test

TEST=Build and run on Galileo Gen2

Change-Id: I39d49790c5eaeedec5051e1fab0b1279275f6e7f
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18865
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 8549f63d65..61955f5b8e 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -36,10 +36,9 @@ int acpi_get_sleep_type(void)
 	if (romstage_handoff_is_resume()) {
 		printk(BIOS_DEBUG, "S3 Resume.\n");
 		return ACPI_S3;
-	} else {
-		printk(BIOS_DEBUG, "Normal boot.\n");
-		return ACPI_S0;
 	}
+	printk(BIOS_DEBUG, "Normal boot.\n");
+	return ACPI_S0;
 }
 #endif
 
@@ -202,8 +201,8 @@ void acpi_prepare_resume_backup(void)
 
 #define WAKEUP_BASE 0x600
 
-void (*acpi_do_wakeup)(uintptr_t vector, u32 backup_source, u32 backup_target,
-	u32 backup_size) asmlinkage = (void *)WAKEUP_BASE;
+asmlinkage void (*acpi_do_wakeup)(uintptr_t vector, u32 backup_source,
+	u32 backup_target, u32 backup_size) = (void *)WAKEUP_BASE;
 
 extern unsigned char __wakeup;
 extern unsigned int __wakeup_size;