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

8 files changed, 8 insertions, 24 deletions

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;
 	}