X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsuperio%2Fnsc%2Fpc87309%2Fsuperio.c;h=e3f7b7b0fef3dc4dfa2b3165ae0ae41ee5008189;hb=a69d978be8a068944466e776de87527fb104a878;hp=04f75fbaa9abc3d3e79999b11e51cfefe557cc18;hpb=2e9323e5bef293c051d9fd982214e6db2e3305ee;p=coreboot.git

diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 04f75fbaa..e3f7b7b0f 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -29,13 +29,12 @@
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87309_config *conf;
+	struct superio_nsc_pc87309_config *conf = dev->chip_info;
 	struct resource *res0;
 
-	if (!dev->enabled) {
+	if (!dev->enabled)
 		return;
-	}
-	conf = dev->chip_info;
+
 	switch (dev->path.pnp.device) {
 	case PC87309_SP1:
 		res0 = find_resource(dev, PNP_IDX_IO0);
@@ -52,21 +51,21 @@ static void init(device_t dev)
 }
 
 static struct device_operations ops = {
-	.read_resources	  = pnp_read_resources,
-	.set_resources	  = pnp_set_resources,
+	.read_resources   = pnp_read_resources,
+	.set_resources    = pnp_set_resources,
 	.enable_resources = pnp_enable_resources,
-	.enable 	  = pnp_enable,
-	.init		  = init,
+	.enable           = pnp_enable,
+	.init             = init,
 };
 
 static struct pnp_info pnp_dev_info[] = {
-	{&ops, PC87309_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0},},
-	{&ops, PC87309_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0},},
-	{&ops, PC87309_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x7f8, 0},},
-	{&ops, PC87309_SP1,  PNP_IO0 | PNP_IRQ0, {0x7f8, 0},},
+	{ &ops, PC87309_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, },
+	{ &ops, PC87309_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, },
+	{ &ops, PC87309_SP2,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, },
+	{ &ops, PC87309_SP1,  PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
 	/* TODO: PM. */
-	{&ops, PC87309_KBCM, PNP_IRQ0},
-	{&ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0}, {0x7f8, 0x4},},
+	{ &ops, PC87309_KBCM, PNP_IRQ0, },
+	{ &ops, PC87309_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x7f8, 4}, },
 };
 
 static void enable_dev(struct device *dev)