From ca62334d76b32c251677049e790b06bc619cce5e Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Wed, 16 Jan 2019 21:55:55 +0100
Subject: [PATCH] util/autoport: Make dsdt.asl prettier

Small cosmetic changes which fix aesthetic inaccuracies.

Change-Id: I8fef4bbe12b283cee2ab8d078de950171757bbfe
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30971
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
---
 util/autoport/main.go | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/util/autoport/main.go b/util/autoport/main.go
index 05a829be4c..dc02a8d1fd 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -838,13 +838,14 @@ func main() {
 
 	for _, define := range DSDTDefines {
 		if define.Comment != "" {
-			fmt.Fprintf(dsdt, "\t/* %s.  */\n", define.Comment)
+			fmt.Fprintf(dsdt, "\t/* %s. */\n", define.Comment)
 		}
 		dsdt.WriteString("#define " + define.Key + " " + define.Value + "\n")
 	}
 
 	dsdt.WriteString(
-		`#include <arch/acpi.h>
+		`
+#include <arch/acpi.h>
 DefinitionBlock(
 	"dsdt.aml",
 	"DSDT",
@@ -854,31 +855,29 @@ DefinitionBlock(
 	0x20141018	// OEM revision
 )
 {
-	// Some generic macros
+	/* Some generic macros */
 	#include "acpi/platform.asl"
 `)
 
 	for _, x := range DSDTIncludes {
 		if x.Comment != "" {
-			fmt.Fprintf(dsdt, "\t/* %s.  */\n", x.Comment)
+			fmt.Fprintf(dsdt, "\t/* %s. */\n", x.Comment)
 		}
 		fmt.Fprintf(dsdt, "\t#include <%s>\n", x.File)
 	}
 
 	dsdt.WriteString(`
-	Scope (\_SB) {
-		Device (PCI0)
-		{
+	Device (\_SB.PCI0)
+	{
 `)
 	for _, x := range DSDTPCI0Includes {
 		if x.Comment != "" {
-			fmt.Fprintf(dsdt, "\t/* %s.  */\n", x.Comment)
+			fmt.Fprintf(dsdt, "\t/* %s. */\n", x.Comment)
 		}
 		fmt.Fprintf(dsdt, "\t\t#include <%s>\n", x.File)
 	}
 	dsdt.WriteString(
-		`		}
-	}
+		`	}
 }
 `)