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

30 files changed, 29 insertions, 86 deletions

diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index 177a7b8a10..9b5847a9e0 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -57,7 +57,6 @@ static void f71889_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case F71889_KBC:
-		res0 = find_resource(dev, PNP_IDX_IO0);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 9c5296df6c..9b6984ecb2 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8671f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -48,8 +48,6 @@ static void init(device_t dev)
 	case IT8671F_PP: /* TODO. */
 		break;
 	case IT8671F_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case IT8671F_KBCM: /* TODO. */
diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index e1d2f50a0f..675ddba773 100644
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8673f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -50,8 +50,6 @@ static void init(device_t dev)
 	case IT8673F_FAN: /* TODO. */
 		break;
 	case IT8673F_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case IT8673F_KBCM: /* TODO. */
diff --git a/src/superio/ite/it8705f/superio.c b/src/superio/ite/it8705f/superio.c
index 04cdd29083..a60c469f71 100644
--- a/src/superio/ite/it8705f/superio.c
+++ b/src/superio/ite/it8705f/superio.c
@@ -28,7 +28,7 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8705f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 4d41ac3412..d551a5be8c 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -46,7 +46,7 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void it8712f_init(device_t dev)
 {
 	struct superio_ite_it8712f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -67,8 +67,6 @@ static void it8712f_init(device_t dev)
 	case IT8712F_EC: /* TODO. */
 		break;
 	case IT8712F_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		set_kbc_ps2_mode();
 		pc_keyboard_init(&conf->keyboard);
 		break;
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 0d4ee68c79..38475d8065 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -78,7 +78,7 @@ static void init_ec(u16 base)
 static void it8716f_init(device_t dev)
 {
 	struct superio_ite_it8716f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -99,8 +99,6 @@ static void it8716f_init(device_t dev)
 		init_ec(res0->base + EC_INDEX_PORT);
 		break;
 	case IT8716F_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/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 3bf2f2fc65..e3f469f86a 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -29,7 +29,7 @@
 static void init(device_t dev)
 {
 	struct superio_ite_it8718f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -50,8 +50,6 @@ static void init(device_t dev)
 	case IT8718F_EC: /* TODO. */
 		break;
 	case IT8718F_KBCK:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case IT8718F_KBCM: /* TODO. */
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;
 
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);
 	}
 }
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 7ed2367759..b94f4fee1b 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -40,7 +40,7 @@ static void pnp_exit_ext_func_mode(device_t dev)
 static void w83627dhg_init(device_t dev)
 {
 	struct superio_winbond_w83627dhg_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -55,8 +55,6 @@ static void w83627dhg_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627DHG_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/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index cc65a65160..1dd8f760bb 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -108,7 +108,7 @@ static void init_hwm(u16 base)
 static void w83627ehg_init(device_t dev)
 {
 	struct superio_winbond_w83627ehg_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -123,8 +123,6 @@ static void w83627ehg_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627EHG_KBC:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case W83627EHG_HWM:
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 3dbe8333fc..42ad46e3e1 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -129,7 +129,7 @@ static void init_hwm(u16 base)
 static void w83627hf_init(device_t dev)
 {
 	struct superio_winbond_w83627hf_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -144,8 +144,6 @@ static void w83627hf_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627HF_KBC:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	case W83627HF_HWM:
diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c
index 021937e988..4efe9aa4a6 100644
--- a/src/superio/winbond/w83627thf/superio.c
+++ b/src/superio/winbond/w83627thf/superio.c
@@ -46,7 +46,7 @@ static void w83627thf_exit_ext_func_mode(device_t dev)
 static void w83627thf_init(device_t dev)
 {
 	struct superio_winbond_w83627thf_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -61,8 +61,6 @@ static void w83627thf_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627THF_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/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 08044a8f53..601ccb6027 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -45,7 +45,7 @@ static void w83627thg_exit_ext_func_mode(device_t dev)
 static void w83627thg_init(device_t dev)
 {
 	struct superio_winbond_w83627thg_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -60,8 +60,6 @@ static void w83627thg_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83627THG_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/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index c80eb95d17..ed22b2166c 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -73,7 +73,7 @@ static void set_uart_clock_source(device_t dev, u8 uart_clock)
 static void w83627uhg_init(device_t dev)
 {
 	struct superio_winbond_w83627uhg_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -110,8 +110,6 @@ static void w83627uhg_init(device_t dev)
 		init_uart8250(res0->base, &conf->com6);
 		break;
 	case W83627UHG_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/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 7ebfd293f3..457180bde9 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -44,7 +44,7 @@ static void w83977f_exit_ext_func_mode(device_t dev)
 static void w83977f_init(device_t dev)
 {
 	struct superio_winbond_w83977f_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -59,8 +59,6 @@ static void w83977f_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83977F_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/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 3cfb1de543..39b6da94cc 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -46,7 +46,7 @@ static void w83977tf_exit_ext_func_mode(device_t dev)
 static void w83977tf_init(device_t dev)
 {
 	struct superio_winbond_w83977tf_config *conf = dev->chip_info;
-	struct resource *res0, *res1;
+	struct resource *res0;
 
 	if (!dev->enabled)
 		return;
@@ -61,8 +61,6 @@ static void w83977tf_init(device_t dev)
 		init_uart8250(res0->base, &conf->com2);
 		break;
 	case W83977TF_KBC:
-		res0 = find_resource(dev, PNP_IDX_IO0);
-		res1 = find_resource(dev, PNP_IDX_IO1);
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}