Remove dead code and make white space more consistent for acpi_tables.c

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5303 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 33 insertions, 35 deletions

diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index 203254b0db..7a071fbfda 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -36,11 +36,11 @@ static void dump_mem(u32 start, u32 end)
 
 	u32 i;
 	print_debug("dump_mem:");
-	for(i=start;i<end;i++) {
-		if((i & 0xf)==0) {
+	for (i = start; i < end; i++) {
+		if ((i & 0xf) == 0) {
 			printk(BIOS_DEBUG, "\n%08x:", i);
 		}
-		printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i));
+		printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)i));
 	}
 	print_debug("\n");
 }
@@ -104,14 +104,13 @@ static void update_ssdtx(void *ssdtx, int i)
 	HCIN = ssdtx + 0x39;
 	UID = ssdtx + 0x40;
 
-	if(i<7) {
-		*PCI  = (u8) ('4' + i - 1);
-	}
-	else {
-		*PCI  = (u8) ('A' + i - 1 - 6);
+	if (i < 7) {
+		*PCI = (u8) ('4' + i - 1);
+	} else {
+		*PCI = (u8) ('A' + i - 1 - 6);
 	}
 	*HCIN = (u8) i;
-	*UID  = (u8) (i+3);
+	*UID = (u8) (i + 3);
 
 	/* FIXME: need to update the GSI id in the ssdtx too */
 
@@ -137,10 +136,10 @@ unsigned long write_acpi_tables(unsigned long start)
 	int i;
 #endif
 
-	get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
+	get_bus_conf();	/* it will get sblk, pci1234, hcdn, and sbdn */
 
 	/* Align ACPI tables to 16 bytes */
-	start	= ( start + 0x0f) & -0x10;
+	start = (start + 0x0f) & -0x10;
 	current = start;
 
 	printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx...\n", start);
@@ -165,31 +164,31 @@ unsigned long write_acpi_tables(unsigned long start)
 	hpet = (acpi_hpet_t *) current;
 	current += sizeof(acpi_hpet_t);
 	acpi_create_hpet(hpet);
-	acpi_add_table(rsdp,hpet);
+	acpi_add_table(rsdp, hpet);
 
 	/* If we want to use HPET Timers Linux wants an MADT */
 	current	  = ( current + 0x07) & -0x08;
 	printk(BIOS_DEBUG, "ACPI:    * MADT at %lx\n",current);
 	madt = (acpi_madt_t *) current;
 	acpi_create_madt(madt);
-	current+=madt->header.length;
-	acpi_add_table(rsdp,madt);
+	current += madt->header.length;
+	acpi_add_table(rsdp, madt);
 
 	/* SRAT */
 	current	  = ( current + 0x07) & -0x08;
 	printk(BIOS_DEBUG, "ACPI:    * SRAT at %lx\n", current);
 	srat = (acpi_srat_t *) current;
 	acpi_create_srat(srat);
-	current+=srat->header.length;
-	acpi_add_table(rsdp,srat);
+	current += srat->header.length;
+	acpi_add_table(rsdp, srat);
 
 	/* SLIT */
 	current	  = ( current + 0x07) & -0x08;
 	printk(BIOS_DEBUG, "ACPI:   * SLIT at %lx\n", current);
 	slit = (acpi_slit_t *) current;
 	acpi_create_slit(slit);
-	current+=slit->header.length;
-	acpi_add_table(rsdp,slit);
+	current += slit->header.length;
+	acpi_add_table(rsdp, slit);
 
 	/* SSDT */
 	current	  = ( current + 0x0f) & -0x10;
@@ -209,41 +208,41 @@ unsigned long write_acpi_tables(unsigned long start)
 
 #if CONFIG_ACPI_SSDTX_NUM >= 1
 
-	/* same htio, but different possition? We may have to copy,
+	/* same htio, but different position? We may have to copy,
 	change HCIN, and recalculate the checknum and add_table */
 
 	for(i=1;i<sysconf.hc_possible_num;i++) {  // 0: is hc sblink
 		if((sysconf.pci1234[i] & 1) != 1 ) continue;
 		u8 c;
-		if(i<7) {
-			c  = (u8) ('4' + i - 1);
-		}
-		else {
-			c  = (u8) ('A' + i - 1 - 6);
+		if (i < 7) {
+			c = (u8) ('4' + i - 1);
+		} else {
+			c = (u8) ('A' + i - 1 - 6);
 		}
 		current	  = ( current + 0x07) & -0x08;
 		printk(BIOS_DEBUG, "ACPI:    * SSDT for PCI%c at %lx\n", c, current); //pci0 and pci1 are in dsdt
 		ssdtx = (acpi_header_t *)current;
-		switch(sysconf.hcid[i]) {
+		switch (sysconf.hcid[i]) {
 		case 1:
 			p = &AmlCode_ssdt2;
 			break;
 		case 2:
 			p = &AmlCode_ssdt3;
 			break;
-		case 3: //8131
+		case 3:	/* 8131 */
 			p = &AmlCode_ssdt4;
-			 break;
-		 default:
-			//HTX no io apic
+			break;
+		default:
+			/* HTX no io apic */
 			p = &AmlCode_ssdt5;
+			break;
 		}
-		current += ((acpi_header_t *)p)->length;
+		current += p->length;
 		memcpy((void *)ssdtx, p, p->length);
 		update_ssdtx((void *)ssdtx, i);
 		ssdtx->checksum = 0;
-		ssdtx->checksum = acpi_checksum((unsigned char *)ssdtx,ssdtx->length);
-		acpi_add_table(rsdp,ssdtx);
+		ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length);
+		acpi_add_table(rsdp, ssdtx);
 	}
 #endif
 
@@ -268,8 +267,8 @@ unsigned long write_acpi_tables(unsigned long start)
 	fadt = (acpi_fadt_t *) current;
 	current += sizeof(acpi_fadt_t);
 
-	acpi_create_fadt(fadt,facs,dsdt);
-	acpi_add_table(rsdp,fadt);
+	acpi_create_fadt(fadt, facs, dsdt);
+	acpi_add_table(rsdp, fadt);
 
 #if DUMP_ACPI_TABLES == 1
 	printk(BIOS_DEBUG, "rsdp\n");
@@ -297,4 +296,3 @@ unsigned long write_acpi_tables(unsigned long start)
 	printk(BIOS_INFO, "ACPI: done.\n");
 	return current;
 }
-