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

6 files changed, 6 insertions, 18 deletions

diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index 31767e0d5e..0fc5eaaf65 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_smsc_fdc37m60x_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled) {
 		return;
@@ -51,8 +51,6 @@ static void init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case FDC37M60X_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case FDC37M60X_AUX: /* TODO. */
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 77fadd8a85..7fd1a9d8e1 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -126,7 +126,7 @@ static void lpc47b272_pnp_enable(device_t dev)
 static void lpc47b272_init(device_t dev)
 {
 	struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -143,8 +143,6 @@ static void lpc47b272_init(device_t dev)
 		break;
 
 	case LPC47B272_KBC:
-		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/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 9df7ee9dc5..1e4ac804e7 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -67,7 +67,7 @@ static void enable_hwm_smbus(device_t dev)
 static void lpc47b397_init(device_t dev)
 {
 	struct superio_smsc_lpc47b397_config *conf;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	if (!dev->enabled) {
 		return;
 	}
@@ -82,8 +82,6 @@ static void lpc47b397_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case LPC47B397_KBC:
-		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/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 2288ec9d15..1cb7e7d262 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -124,7 +124,7 @@ static void lpc47m10x_pnp_enable(device_t dev)
 static void lpc47m10x_init(device_t dev)
 {
 	struct superio_smsc_lpc47m10x_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -141,8 +141,6 @@ static void lpc47m10x_init(device_t dev)
 		break;
 
 	case LPC47M10X2_KBC:
-		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/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index b05e1014ab..c221583b89 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -99,7 +99,7 @@ static void lpc47m15x_pnp_enable(device_t dev)
 static void lpc47m15x_init(device_t dev)
 {
 	struct superio_smsc_lpc47m15x_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -116,8 +116,6 @@ static void lpc47m15x_init(device_t dev)
 		break;
 
 	case LPC47M15X_KBC:
-		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/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 0fa2c36d76..99e9783052 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -205,7 +205,7 @@ static void smsc_pnp_enable(device_t dev)
 static void smsc_init(device_t dev)
 {
 	struct superio_smsc_smscsuperio_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 	int i, ld;
 
 	/* Do not initialize disabled devices. */
@@ -230,8 +230,6 @@ static void smsc_init(device_t dev)
 		res0 = find_resource(dev, PNP_IDX_IO0);
 		init_uart8250(res0->base, &conf->com2);
 	} else if (ld == logical_device_table[i].devs[LD_KBC]) {
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 	}
 }