Remove superfluous Super I/O res0/res1 lines.

The pc_keyboard_init() function no longer takes any base addresses
since r5152 (passed in via res0/res1 variables previously), so drop them.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Patrick Georgi <patrick@georgi-clan.de>



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

9 files changed, 9 insertions, 27 deletions

diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 0ea594a778..189c2d1dbf 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc8374_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -52,8 +52,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC8374_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index b4a47d523c..04f75fbaa9 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -30,7 +30,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87309_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled) {
 		return;
@@ -46,8 +46,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87309_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 2202f35438..83f10b93f7 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -40,7 +40,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87351_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -58,8 +58,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87351_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index d4874ff1a9..d85d10a648 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87360_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -52,8 +52,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87360_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 22e26898d2..a38f386d60 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -34,7 +34,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87366_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -52,8 +52,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87366_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index d311714639..1eee9595bf 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -35,7 +35,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87417_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -53,8 +53,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87417_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index f8e4483168..82efb3c4ee 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -32,7 +32,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc87427_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
 	 */
@@ -50,8 +50,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case PC87427_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index 6ded3a07e3..bd14919eca 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc97307_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled) {
 		return;
@@ -53,8 +53,6 @@ static void init(device_t dev)
 		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */
 		pnp_set_enable(dev, 1); /* Enable keyboard */
 
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 96dfbef327..2dced41898 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_nsc_pc97317_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled) {
 		return;
@@ -53,8 +53,6 @@ static void init(device_t dev)
 		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 Mhz */
 		pnp_set_enable(dev, 1); /* Enable keyboard */
 
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;