8 files changed, 9 insertions, 22 deletions
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 269e57c869..fdab974b93 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -23,7 +23,6 @@
 #include <superio/conf_mode.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83627dhg.h"
 
 static void w83627dhg_enable_UR2(device_t dev)
@@ -39,7 +38,6 @@ static void w83627dhg_enable_UR2(device_t dev)
 
 static void w83627dhg_init(device_t dev)
 {
-	struct superio_winbond_w83627dhg_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
@@ -49,7 +47,7 @@ static void w83627dhg_init(device_t dev)
 		w83627dhg_enable_UR2(dev);
 		break;
 	case W83627DHG_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 62d331126d..aae0ac453e 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -30,7 +30,6 @@
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83627ehg.h"
 
 static void pnp_write_index(u16 port, u8 reg, u8 value)
@@ -95,7 +94,6 @@ 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;
 
 	if (!dev->enabled)
@@ -103,7 +101,7 @@ static void w83627ehg_init(device_t dev)
 
 	switch(dev->path.pnp.device) {
 	case W83627EHG_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	case W83627EHG_HWM:
 		res0 = find_resource(dev, PNP_IDX_IO0);
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index c88174357c..5445b47a58 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -30,7 +30,6 @@
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83627hf.h"
 
 static void pnp_write_index(u16 port, u8 reg, u8 value)
@@ -102,7 +101,6 @@ 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;
 
 	if (!dev->enabled)
@@ -110,7 +108,7 @@ static void w83627hf_init(device_t dev)
 
 	switch(dev->path.pnp.device) {
 	case W83627HF_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	case W83627HF_HWM:
 		res0 = find_resource(dev, PNP_IDX_IO0);
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index f6aba10bf2..75186fae6c 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -27,19 +27,17 @@
 #include <console/console.h>
 #include <string.h>
 #include <pc80/keyboard.h>
-#include "chip.h"
 #include "w83627thg.h"
 
 static void w83627thg_init(device_t dev)
 {
-	struct superio_winbond_w83627thg_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case W83627THG_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 5775ff5577..f0d9aefae4 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <pc80/keyboard.h>
-#include "chip.h"
 #include "w83627uhg.h"
 
 /*
@@ -60,7 +59,6 @@ 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;
 
 	if (!dev->enabled)
 		return;
@@ -85,7 +83,7 @@ static void w83627uhg_init(device_t dev)
 		set_uart_clock_source(dev, 0);
 		break;
 	case W83627UHG_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index f89607857e..933da9554c 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -27,7 +27,8 @@
 #include <lib.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
 #include "w83697hf.h"
 
 static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divisor) {
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 32ecf1857c..232f46adc4 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -26,19 +26,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83977f.h"
 
 static void w83977f_init(device_t dev)
 {
-	struct superio_winbond_w83977f_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case W83977F_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 7f2dffb836..a61770aa9f 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -28,19 +28,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "w83977tf.h"
 
 static void w83977tf_init(device_t dev)
 {
-	struct superio_winbond_w83977tf_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case W83977TF_KBC:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }