C and other Super I/O cosmetic fixes.

 - Random coding style, whitespace and cosmetic fixes.
 
 - Consistently use the same spacing and 4-hexdigit port number format
   in the pnp_dev_info[] arrays.
 
 - Drop dead/unused code and less useful comments.
 
 - Add missing "(C)" characters and copyright years.
 
 - Shorten and simplify some code snippets.
 
 - Use u8/u16/etc. everywhere.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



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

2 files changed, 23 insertions, 32 deletions

diff --git a/src/superio/nsc/pc97307/Makefile.inc b/src/superio/nsc/pc97307/Makefile.inc
index 67295a219f..874353292e 100644
--- a/src/superio/nsc/pc97307/Makefile.inc
+++ b/src/superio/nsc/pc97307/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-#config chip.h
 ramstage-$(CONFIG_SUPERIO_NSC_PC97307) += superio.c
+
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index bd14919eca..b8ae944153 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -28,45 +28,37 @@
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc97307_config *conf;
+	struct superio_nsc_pc97307_config *conf = dev->chip_info;
 	struct resource *res0;
+	u8 reg8;
 
-	if (!dev->enabled) {
+	if (!dev->enabled)
 		return;
-	}
-	conf = dev->chip_info;
+
 	switch(dev->path.pnp.device) {
 	case PC97307_SP1:
 		res0 = find_resource(dev, PNP_IDX_IO0);
 		init_uart8250(res0->base, &conf->com1);
 		break;
-
 	case PC97307_SP2:
 		res0 = find_resource(dev, PNP_IDX_IO0);
 		init_uart8250(res0->base, &conf->com2);
 		break;
-
 	case PC97307_KBCK:
-		/* Enable keyboard */
 		pnp_set_logical_device(dev);
-		pnp_set_enable(dev, 0); /* Disable keyboard */
-		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */
-		pnp_set_enable(dev, 1); /* Enable keyboard */
-
+		pnp_set_enable(dev, 0);		   /* Disable keyboard */
+		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */
+		pnp_set_enable(dev, 1);		   /* Enable keyboard. */
 		pc_keyboard_init(&conf->keyboard);
 		break;
-
 	case PC97307_FDC:
-	{
-		unsigned reg;
-		/* Set up floppy in PS/2 mode */
+		/* Set up floppy in PS/2 mode. */
 		outb(0x09, SIO_CONFIG_RA);
-		reg = inb(SIO_CONFIG_RD);
-		reg = (reg & 0x3F) | 0x40;
-		outb(reg, SIO_CONFIG_RD);
-		outb(reg, SIO_CONFIG_RD);       /* Have to write twice to change! */
+		reg8 = inb(SIO_CONFIG_RD);
+		reg8 = (reg8 & 0x3F) | 0x40;
+		outb(reg8, SIO_CONFIG_RD);
+		outb(reg8, SIO_CONFIG_RD); /* Have to write twice to change! */
 		break;
-	}
 	default:
 		break;
 	}
@@ -81,21 +73,20 @@ static struct device_operations ops = {
 };
 
 static struct pnp_info pnp_dev_info[] = {
-	{ &ops, PC97307_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0xffb, 0 }, { 0xffb, 0x4}, },
-	{ &ops, PC97307_KBCM, PNP_IRQ0 },
-	{ &ops, PC97307_RTC,  PNP_IO0 | PNP_IRQ0, { 0xfffe, 0}, },
-	{ &ops, PC97307_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0xfffa, 0}, },
-	{ &ops, PC97307_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x03fc, 0}, },
-	{ &ops, PC97307_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0xfff8, 0 }, },
-	{ &ops, PC97307_SP1,  PNP_IO0 | PNP_IRQ0, { 0xfff8, 0 }, },
-	{ &ops, PC97307_GPIO, PNP_IO0, { 0xfff8, 0 } },
-	{ &ops, PC97307_PM,   PNP_IO0, { 0xfffe, 0 } },
+	{ &ops, PC97307_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x0ffb, 0}, {0x0ffb, 4}, },
+	{ &ops, PC97307_KBCM, PNP_IRQ0, },
+	{ &ops, PC97307_RTC,  PNP_IO0 | PNP_IRQ0, {0xfffe, 0}, },
+	{ &ops, PC97307_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0xfffa, 0}, },
+	{ &ops, PC97307_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x03fc, 0}, },
+	{ &ops, PC97307_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0xfff8, 0}, },
+	{ &ops, PC97307_SP1,  PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, },
+	{ &ops, PC97307_GPIO, PNP_IO0, {0xfff8, 0}, },
+	{ &ops, PC97307_PM,   PNP_IO0, {0xfffe, 0}, },
 };
 
 static void enable_dev(struct device *dev)
 {
-	pnp_enable_devices(dev, &ops,
-		ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+	pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_nsc_pc97307_ops = {