9 files changed, 14 insertions, 27 deletions

diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 71cde2ca04..8b6f1caf01 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -26,19 +26,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc8374.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc8374_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC8374_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index 52fc14f4ef..f374e6aa20 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -23,19 +23,17 @@
 #include <device/pnp.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc87309.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87309_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch (dev->path.pnp.device) {
 	case PC87309_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 4d9469ed63..7f395b4be8 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -26,19 +26,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc87351.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87351_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC87351_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 92731e72c1..a53cc35126 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -26,19 +26,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc87360.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87360_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC87360_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index 1874ab3d2b..27bdd6ed3c 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -26,19 +26,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc87366.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87366_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC87366_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 3b91f369cd..99882a58c0 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -27,19 +27,17 @@
 #include <string.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
-#include "chip.h"
 #include "pc87417.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87417_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC87417_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index ae02f012e2..170fd8544f 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -25,19 +25,18 @@
 #include <console/console.h>
 #include <string.h>
 #include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
 #include "pc87427.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc87427_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
 	case PC87427_KBCK:
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	}
 }
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index c1cd5c12d2..af7ca777bf 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -23,12 +23,12 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
 #include "pc97307.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc97307_config *conf = dev->chip_info;
 	u8 reg8;
 
 	if (!dev->enabled)
@@ -40,7 +40,7 @@ static void init(device_t dev)
 		pnp_set_enable(dev, 0);		   /* Disable keyboard */
 		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */
 		pnp_set_enable(dev, 1);		   /* Enable keyboard. */
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	case PC97307_FDC:
 		/* Set up floppy in PS/2 mode. */
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index a69dfe7fad..6f39c5da8c 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -23,12 +23,12 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <stdlib.h>
-#include "chip.h"
+#include <pc80/keyboard.h>
+#include "chip.h" /* FIXME */
 #include "pc97317.h"
 
 static void init(device_t dev)
 {
-	struct superio_nsc_pc97317_config *conf = dev->chip_info;
 
 	if (!dev->enabled)
 		return;
@@ -39,7 +39,7 @@ static void init(device_t dev)
 		pnp_set_enable(dev, 0);		   /* Disable keyboard */
 		pnp_write_config(dev, 0xf0, 0x40); /* Set KBC clock to 8 MHz. */
 		pnp_set_enable(dev, 1);		   /* Enable keyboard */
-		pc_keyboard_init(&conf->keyboard);
+		pc_keyboard_init();
 		break;
 	default:
 		break;