src/*: Remove the last remnants of struct keyboard

Change-Id: I7d0e8d2119a470428cfc01c0738b8988ab75ba2d
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5624
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

16 files changed, 6 insertions, 112 deletions

diff --git a/src/ec/compal/ene932/chip.h b/src/ec/compal/ene932/chip.h
index 5d209ffa05..7dcd3ebdd8 100644
--- a/src/ec/compal/ene932/chip.h
+++ b/src/ec/compal/ene932/chip.h
@@ -23,13 +23,11 @@
 #define _EC_COMPAL_ENE932_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_compal_ene932_ops;
 
 struct ec_compal_ene932_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_COMPAL_ENE932_CHIP_H */
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index e60a0ac9e0..2e83b4ccc4 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <arch/io.h>
 #include <delay.h>
+#include <pc80/keyboard.h>
 #include "ec.h"
 #include "chip.h"
 
diff --git a/src/ec/google/chromeec/chip.h b/src/ec/google/chromeec/chip.h
index eb356328fc..1cd97f478b 100644
--- a/src/ec/google/chromeec/chip.h
+++ b/src/ec/google/chromeec/chip.h
@@ -21,12 +21,10 @@
 #define EC_GOOGLE_CHROMEEC_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 extern struct chip_operations ec_google_chromeec_ops;
 
 struct ec_google_chromeec_config {
-	struct pc_keyboard keyboard;
 };
 
-#endif
+#endif /* EC_GOOGLE_CHROMEEC_CHIP_H */
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 5f377c923e..8b1cb2ff62 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -24,6 +24,7 @@
 #include <arch/io.h>
 #include <delay.h>
 #include <device/pnp.h>
+#include <pc80/keyboard.h>
 #include "chip.h"
 #include "ec.h"
 #include "ec_commands.h"
diff --git a/src/ec/quanta/ene_kb3940q/chip.h b/src/ec/quanta/ene_kb3940q/chip.h
index ce95c1c27e..6a28c43a94 100644
--- a/src/ec/quanta/ene_kb3940q/chip.h
+++ b/src/ec/quanta/ene_kb3940q/chip.h
@@ -23,13 +23,11 @@
 #define _EC_QUANTA_ENE_KB3940Q_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_quanta_ene_kb3940q_ops;
 
 struct ec_quanta_ene_kb3940q_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_QUANTA_ENE_KB3940Q_CHIP_H */
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 57854d051f..7d0e6ae309 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <delay.h>
 #include <elog.h>
+#include <pc80/keyboard.h>
 #include "ec.h"
 #include "chip.h"
 
diff --git a/src/ec/quanta/it8518/chip.h b/src/ec/quanta/it8518/chip.h
index cc7d3745a9..52e842b87d 100644
--- a/src/ec/quanta/it8518/chip.h
+++ b/src/ec/quanta/it8518/chip.h
@@ -23,13 +23,11 @@
 #define _EC_QUANTA_IT8518_CHIP_H
 
 #include <device/device.h>
-#include <pc80/keyboard.h>
 
 struct chip_operations;
 extern struct chip_operations ec_quanta_it8518_ops;
 
 struct ec_quanta_it8518_config {
-	struct pc_keyboard keyboard;
 };
 
 #endif /* _EC_QUANTA_IT8518_CHIP_H */
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 7588a1ea4a..9e6d3d0847 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -22,6 +22,7 @@
 
 
 #include <console/console.h>
+#include <pc80/keyboard.h>
 
 #ifndef __PRE_RAM__
 #include <device/device.h>
diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h
index 5f9772382c..16cb959799 100644
--- a/src/include/pc80/keyboard.h
+++ b/src/include/pc80/keyboard.h
@@ -1,10 +1,6 @@
 #ifndef PC80_KEYBOARD_H
 #define PC80_KEYBOARD_H
 
-struct pc_keyboard {
-	/* No initialization parameters for now */
-};
-
 void pc_keyboard_init(void);
 void set_kbc_ps2_mode(void);
 
diff --git a/src/southbridge/via/vt82c686/chip.h b/src/southbridge/via/vt82c686/chip.h
deleted file mode 100644
index 5c4959f1f2..0000000000
--- a/src/southbridge/via/vt82c686/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007 Corey Osgood <corey_osgood@verizon.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef _SUPERIO_VIA_VT82C686
-#define _SUPERIO_VIA_VT82C686
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_via_vt82c686_config {
-	struct pc_keyboard keyboard;
-};
-
-#endif				/* _SUPERIO_VIA_VT82C686 */
diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h
index ddad589847..e12e51dda9 100644
--- a/src/superio/fintek/f71869ad/chip.h
+++ b/src/superio/fintek/f71869ad/chip.h
@@ -21,12 +21,9 @@
 #ifndef SUPERIO_FINTEK_F71869AD_CHIP_H
 #define SUPERIO_FINTEK_F71869AD_CHIP_H
 
-#include <pc80/keyboard.h>
 #include <stdint.h>
 
 struct superio_fintek_f71869ad_config {
-	struct pc_keyboard keyboard;
-
 	/* Member variables are defined in devicetree.cb. */
 	uint8_t multi_function_register_1;
 	uint8_t multi_function_register_2;
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index 93ec33c9f0..2664f99ba0 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -24,6 +24,7 @@
 #include <superio/conf_mode.h>
 #include <console/console.h>
 #include <stdlib.h>
+#include <pc80/keyboard.h>
 
 #include "fintek_internal.h"
 #include "chip.h"
diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h
deleted file mode 100644
index e4126a7b5c..0000000000
--- a/src/superio/smsc/fdc37n972/chip.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_FDC37N972_CHIP_H
-#define SUPERIO_SMSC_FDC37N972_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_fdc37n972_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
-
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index f7ae697803..78d8350da7 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <pc80/keyboard.h>
-#include "chip.h"
 #include "fdc37n972.h"
 
 static void init(device_t dev)
diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h
deleted file mode 100644
index cde51d1ed6..0000000000
--- a/src/superio/smsc/sio10n268/chip.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef SUPERIO_SMSC_SIO10N268_CHIP_H
-#define SUPERIO_SMSC_SIO10N268_CHIP_H
-
-#include <device/device.h>
-#include <pc80/keyboard.h>
-
-struct superio_smsc_sio10n268_config {
-
-	struct pc_keyboard keyboard;
-};
-
-#endif
diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index 40c01b4bd8..f69e3bf88c 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -21,7 +21,6 @@
 #include <device/device.h>
 #include <device/pnp.h>
 #include <pc80/keyboard.h>
-#include "chip.h"
 #include "sio10n268.h"
 
 static void init(device_t dev)