Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5616
-gerrit
commit 28175fbc2d188ef76660277c8e4ebbb75e668350 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Wed Apr 30 04:12:21 2014 +1000
src/drivers/pc80: Remove empty struct keyboard
This is a empty struct that has propogated though the superio's but really does nothing. Time to get rid of it before it adds yet more cruft.
Change-Id: Icfa0a97373242573be2fbc07bffd760d6536245d Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/drivers/pc80/keyboard.c | 2 +- src/include/pc80/keyboard.h | 6 +----- src/superio/fintek/f71863fg/chip.h | 1 - src/superio/fintek/f71863fg/superio.c | 2 +- src/superio/fintek/f71869ad/chip.h | 1 - src/superio/fintek/f71869ad/superio.c | 2 +- src/superio/fintek/f71872/chip.h | 1 - src/superio/fintek/f71872/superio.c | 2 +- src/superio/fintek/f71889/chip.h | 1 - src/superio/fintek/f71889/superio.c | 2 +- src/superio/fintek/f81865f/chip.h | 1 - src/superio/fintek/f81865f/superio.c | 2 +- src/superio/ite/it8671f/chip.h | 1 - src/superio/ite/it8671f/superio.c | 2 +- src/superio/ite/it8712f/chip.h | 1 - src/superio/ite/it8712f/superio.c | 2 +- src/superio/ite/it8716f/chip.h | 1 - src/superio/ite/it8716f/superio.c | 2 +- src/superio/ite/it8718f/chip.h | 1 - src/superio/ite/it8718f/superio.c | 2 +- src/superio/ite/it8721f/chip.h | 1 - src/superio/ite/it8721f/superio.c | 2 +- src/superio/ite/it8772f/chip.h | 1 - src/superio/ite/it8772f/superio.c | 2 +- src/superio/nsc/pc8374/chip.h | 1 - src/superio/nsc/pc8374/superio.c | 2 +- src/superio/nsc/pc87309/chip.h | 1 - src/superio/nsc/pc87309/superio.c | 2 +- src/superio/nsc/pc87351/chip.h | 1 - src/superio/nsc/pc87351/superio.c | 2 +- src/superio/nsc/pc87360/chip.h | 1 - src/superio/nsc/pc87360/superio.c | 2 +- src/superio/nsc/pc87366/chip.h | 1 - src/superio/nsc/pc87366/superio.c | 2 +- src/superio/nsc/pc87417/chip.h | 1 - src/superio/nsc/pc87417/superio.c | 2 +- src/superio/nsc/pc87427/chip.h | 1 - src/superio/nsc/pc87427/superio.c | 2 +- src/superio/nsc/pc97307/chip.h | 1 - src/superio/nsc/pc97307/superio.c | 2 +- src/superio/nsc/pc97317/chip.h | 1 - src/superio/nsc/pc97317/superio.c | 2 +- src/superio/nuvoton/wpcm450/chip.h | 1 - src/superio/nuvoton/wpcm450/superio.c | 2 +- src/superio/renesas/m3885x/chip.h | 1 - src/superio/renesas/m3885x/superio.c | 2 +- src/superio/smsc/fdc37m60x/chip.h | 1 - src/superio/smsc/fdc37m60x/superio.c | 2 +- src/superio/smsc/fdc37n972/chip.h | 1 - src/superio/smsc/fdc37n972/fdc37n972.c | 2 +- src/superio/smsc/kbc1100/chip.h | 1 - src/superio/smsc/kbc1100/superio.c | 2 +- src/superio/smsc/lpc47b272/chip.h | 1 - src/superio/smsc/lpc47b272/superio.c | 2 +- src/superio/smsc/lpc47b397/chip.h | 1 - src/superio/smsc/lpc47b397/superio.c | 2 +- src/superio/smsc/lpc47m10x/chip.h | 1 - src/superio/smsc/lpc47m10x/superio.c | 2 +- src/superio/smsc/lpc47m15x/chip.h | 1 - src/superio/smsc/lpc47m15x/superio.c | 2 +- src/superio/smsc/lpc47n227/chip.h | 1 - src/superio/smsc/lpc47n227/superio.c | 2 +- src/superio/smsc/mec1308/chip.h | 1 - src/superio/smsc/mec1308/superio.c | 2 +- src/superio/smsc/sch4037/chip.h | 1 - src/superio/smsc/sch4037/superio.c | 2 +- src/superio/smsc/sio10n268/chip.h | 1 - src/superio/smsc/sio10n268/sio10n268.c | 2 +- src/superio/smsc/smscsuperio/chip.h | 1 - src/superio/smsc/smscsuperio/superio.c | 2 +- src/superio/winbond/w83627dhg/chip.h | 1 - src/superio/winbond/w83627dhg/superio.c | 2 +- src/superio/winbond/w83627ehg/chip.h | 1 - src/superio/winbond/w83627ehg/superio.c | 2 +- src/superio/winbond/w83627hf/chip.h | 1 - src/superio/winbond/w83627hf/superio.c | 2 +- src/superio/winbond/w83627thg/chip.h | 1 - src/superio/winbond/w83627thg/superio.c | 2 +- src/superio/winbond/w83627uhg/chip.h | 1 - src/superio/winbond/w83627uhg/superio.c | 2 +- src/superio/winbond/w83977f/chip.h | 1 - src/superio/winbond/w83977f/superio.c | 2 +- src/superio/winbond/w83977tf/chip.h | 1 - src/superio/winbond/w83977tf/superio.c | 2 +- 84 files changed, 43 insertions(+), 88 deletions(-)
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 5b68617..6a573d8 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -193,7 +193,7 @@ static u8 send_keyboard(u8 command) return regval; }
-void pc_keyboard_init(struct pc_keyboard *keyboard) +void pc_keyboard_init(void) { u8 retries; u8 regval; diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index ce281bb..16cb959 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -1,11 +1,7 @@ #ifndef PC80_KEYBOARD_H #define PC80_KEYBOARD_H
-struct pc_keyboard { - /* No initialization parameters for now */ -}; - -void pc_keyboard_init(struct pc_keyboard *keyboard); +void pc_keyboard_init(void); void set_kbc_ps2_mode(void);
#endif /* PC80_KEYBOARD_H */ diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h index a2c04d7..6478c7b 100644 --- a/src/superio/fintek/f71863fg/chip.h +++ b/src/superio/fintek/f71863fg/chip.h @@ -25,7 +25,6 @@
struct superio_fintek_f71863fg_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_FINTEK_F71863FG_CHIP_H */ diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c index 29b5ab3..62b7487 100644 --- a/src/superio/fintek/f71863fg/superio.c +++ b/src/superio/fintek/f71863fg/superio.c @@ -39,7 +39,7 @@ static void f71863fg_init(device_t dev) /* TODO: Might potentially need code for HWM or FDC etc. */ case F71863FG_KBC: res0 = find_resource(dev, PNP_IDX_IO0); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h index ea2ee6e..71f4bbe 100644 --- a/src/superio/fintek/f71869ad/chip.h +++ b/src/superio/fintek/f71869ad/chip.h @@ -24,7 +24,6 @@ #include <pc80/keyboard.h>
struct superio_fintek_f71869ad_config { - struct pc_keyboard keyboard; };
#endif /* SUPERIO_FINTEK_F71869AD_CHIP_H */ diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c index 11ad6f8..64be33a 100644 --- a/src/superio/fintek/f71869ad/superio.c +++ b/src/superio/fintek/f71869ad/superio.c @@ -38,7 +38,7 @@ static void f71869ad_init(device_t dev) switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ case F71869AD_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/fintek/f71872/chip.h b/src/superio/fintek/f71872/chip.h index 3368ef2..2aff126 100644 --- a/src/superio/fintek/f71872/chip.h +++ b/src/superio/fintek/f71872/chip.h @@ -25,7 +25,6 @@
struct superio_fintek_f71872_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_FINTEK_F71872_CHIP_H */ diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c index 55a11b1..381fc2b 100644 --- a/src/superio/fintek/f71872/superio.c +++ b/src/superio/fintek/f71872/superio.c @@ -37,7 +37,7 @@ static void f71872_init(device_t dev) switch(dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ case F71872_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h index e5a15d3..e6af982 100644 --- a/src/superio/fintek/f71889/chip.h +++ b/src/superio/fintek/f71889/chip.h @@ -25,7 +25,6 @@
struct superio_fintek_f71889_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_FINTEK_F71889_CHIP_H */ diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c index 71edafc..31e2b68 100644 --- a/src/superio/fintek/f71889/superio.c +++ b/src/superio/fintek/f71889/superio.c @@ -37,7 +37,7 @@ static void f71889_init(device_t dev) switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ case F71889_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/fintek/f81865f/chip.h b/src/superio/fintek/f81865f/chip.h index ae4da18..b0aba99 100644 --- a/src/superio/fintek/f81865f/chip.h +++ b/src/superio/fintek/f81865f/chip.h @@ -27,7 +27,6 @@
struct superio_fintek_f81865f_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_FINTEK_F81865_CHIP_H */ diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c index 85ac7ba..b833a8f 100644 --- a/src/superio/fintek/f81865f/superio.c +++ b/src/superio/fintek/f81865f/superio.c @@ -37,7 +37,7 @@ static void f81865f_init(device_t dev) switch (dev->path.pnp.device) { /* TODO: Might potentially need code for HWM or FDC etc. */ case F81865F_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/ite/it8671f/chip.h b/src/superio/ite/it8671f/chip.h index 7d5c1d4..e524232 100644 --- a/src/superio/ite/it8671f/chip.h +++ b/src/superio/ite/it8671f/chip.h @@ -26,7 +26,6 @@
struct superio_ite_it8671f_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c index 21c70ec..4d26584 100644 --- a/src/superio/ite/it8671f/superio.c +++ b/src/superio/ite/it8671f/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev) case IT8671F_PP: /* TODO. */ break; case IT8671F_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; case IT8671F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8712f/chip.h b/src/superio/ite/it8712f/chip.h index 1f159cd..9867aa5 100644 --- a/src/superio/ite/it8712f/chip.h +++ b/src/superio/ite/it8712f/chip.h @@ -26,7 +26,6 @@
struct superio_ite_it8712f_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c index 2fd3440..585e927 100644 --- a/src/superio/ite/it8712f/superio.c +++ b/src/superio/ite/it8712f/superio.c @@ -58,7 +58,7 @@ static void it8712f_init(device_t dev) break; case IT8712F_KBCK: set_kbc_ps2_mode(); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; case IT8712F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8716f/chip.h b/src/superio/ite/it8716f/chip.h index afdcd96..43c5d97 100644 --- a/src/superio/ite/it8716f/chip.h +++ b/src/superio/ite/it8716f/chip.h @@ -25,7 +25,6 @@
struct superio_ite_it8716f_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_ITE_IT8716F_CHIP_H */ diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c index 8cf3c5f..2ec1327 100644 --- a/src/superio/ite/it8716f/superio.c +++ b/src/superio/ite/it8716f/superio.c @@ -90,7 +90,7 @@ static void it8716f_init(device_t dev) init_ec(res0->base + EC_INDEX_PORT); break; case IT8716F_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/ite/it8718f/chip.h b/src/superio/ite/it8718f/chip.h index a23687c..7405d34 100644 --- a/src/superio/ite/it8718f/chip.h +++ b/src/superio/ite/it8718f/chip.h @@ -26,7 +26,6 @@
struct superio_ite_it8718f_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c index 998d271..7288d4b 100644 --- a/src/superio/ite/it8718f/superio.c +++ b/src/superio/ite/it8718f/superio.c @@ -40,7 +40,7 @@ static void init(device_t dev) case IT8718F_EC: /* TODO. */ break; case IT8718F_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; case IT8718F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8721f/chip.h b/src/superio/ite/it8721f/chip.h index e903cd6..5bacc21 100644 --- a/src/superio/ite/it8721f/chip.h +++ b/src/superio/ite/it8721f/chip.h @@ -24,7 +24,6 @@ #include <pc80/keyboard.h>
struct superio_ite_it8721f_config { - struct pc_keyboard keyboard; };
#endif /* SUPERIO_ITE_IT8721F_CHIP_H */ diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c index 300a480..90cf734 100644 --- a/src/superio/ite/it8721f/superio.c +++ b/src/superio/ite/it8721f/superio.c @@ -41,7 +41,7 @@ static void init(device_t dev) case IT8721F_EC: /* TODO. */ break; case IT8721F_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; case IT8721F_KBCM: /* TODO. */ break; diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h index 9c9aaa6..70268cc 100644 --- a/src/superio/ite/it8772f/chip.h +++ b/src/superio/ite/it8772f/chip.h @@ -25,7 +25,6 @@ #include <pc80/keyboard.h>
struct superio_ite_it8772f_config { - struct pc_keyboard keyboard;
/* GPIO SimpleIO register values via devicetree.cb */ u8 gpio_set1; diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c index e7e82a8..ffb29ed 100644 --- a/src/superio/ite/it8772f/superio.c +++ b/src/superio/ite/it8772f/superio.c @@ -177,7 +177,7 @@ static void it8772f_init(device_t dev) case IT8772F_KBCK: if (!conf->skip_keyboard) { set_kbc_ps2_mode(); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); } break; case IT8772F_KBCM: diff --git a/src/superio/nsc/pc8374/chip.h b/src/superio/nsc/pc8374/chip.h index 40a9b60..b961260 100644 --- a/src/superio/nsc/pc8374/chip.h +++ b/src/superio/nsc/pc8374/chip.h @@ -26,7 +26,6 @@
struct superio_nsc_pc8374_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c index 71cde2c..64c38c6 100644 --- a/src/superio/nsc/pc8374/superio.c +++ b/src/superio/nsc/pc8374/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC8374_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87309/chip.h b/src/superio/nsc/pc87309/chip.h index e769a85..5b21611 100644 --- a/src/superio/nsc/pc87309/chip.h +++ b/src/superio/nsc/pc87309/chip.h @@ -25,7 +25,6 @@
struct superio_nsc_pc87309_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c index 52fc14f..5d055b9 100644 --- a/src/superio/nsc/pc87309/superio.c +++ b/src/superio/nsc/pc87309/superio.c @@ -35,7 +35,7 @@ static void init(device_t dev)
switch (dev->path.pnp.device) { case PC87309_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87351/chip.h b/src/superio/nsc/pc87351/chip.h index 39faee4..00543e9 100644 --- a/src/superio/nsc/pc87351/chip.h +++ b/src/superio/nsc/pc87351/chip.h @@ -26,7 +26,6 @@
struct superio_nsc_pc87351_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c index 4d9469e..6959e39 100644 --- a/src/superio/nsc/pc87351/superio.c +++ b/src/superio/nsc/pc87351/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC87351_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87360/chip.h b/src/superio/nsc/pc87360/chip.h index e48c0f2..92c8f9c 100644 --- a/src/superio/nsc/pc87360/chip.h +++ b/src/superio/nsc/pc87360/chip.h @@ -26,7 +26,6 @@
struct superio_nsc_pc87360_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c index 92731e7..cda696b 100644 --- a/src/superio/nsc/pc87360/superio.c +++ b/src/superio/nsc/pc87360/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC87360_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87366/chip.h b/src/superio/nsc/pc87366/chip.h index 0ce8abd..5a68b06 100644 --- a/src/superio/nsc/pc87366/chip.h +++ b/src/superio/nsc/pc87366/chip.h @@ -26,7 +26,6 @@
struct superio_nsc_pc87366_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c index 1874ab3..6661f6b 100644 --- a/src/superio/nsc/pc87366/superio.c +++ b/src/superio/nsc/pc87366/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC87366_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87417/chip.h b/src/superio/nsc/pc87417/chip.h index 8c1e8e0..881feda 100644 --- a/src/superio/nsc/pc87417/chip.h +++ b/src/superio/nsc/pc87417/chip.h @@ -27,7 +27,6 @@
struct superio_nsc_pc87417_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c index 3b91f36..58de288 100644 --- a/src/superio/nsc/pc87417/superio.c +++ b/src/superio/nsc/pc87417/superio.c @@ -39,7 +39,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC87417_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc87427/chip.h b/src/superio/nsc/pc87427/chip.h index 4500aa9..36a16c4 100644 --- a/src/superio/nsc/pc87427/chip.h +++ b/src/superio/nsc/pc87427/chip.h @@ -26,7 +26,6 @@
struct superio_nsc_pc87427_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c index ae02f01..f184039 100644 --- a/src/superio/nsc/pc87427/superio.c +++ b/src/superio/nsc/pc87427/superio.c @@ -37,7 +37,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case PC87427_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/nsc/pc97307/chip.h b/src/superio/nsc/pc97307/chip.h index e0c1330..57ac646 100644 --- a/src/superio/nsc/pc97307/chip.h +++ b/src/superio/nsc/pc97307/chip.h @@ -32,6 +32,5 @@
struct superio_nsc_pc97307_config {
- struct pc_keyboard keyboard; }; #endif diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c index c1cd5c1..09ab4ac 100644 --- a/src/superio/nsc/pc97307/superio.c +++ b/src/superio/nsc/pc97307/superio.c @@ -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/chip.h b/src/superio/nsc/pc97317/chip.h index d896916..7bd3b5c 100644 --- a/src/superio/nsc/pc97317/chip.h +++ b/src/superio/nsc/pc97317/chip.h @@ -32,7 +32,6 @@
struct superio_nsc_pc97317_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c index a69dfe7..8bbbaa2 100644 --- a/src/superio/nsc/pc97317/superio.c +++ b/src/superio/nsc/pc97317/superio.c @@ -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; diff --git a/src/superio/nuvoton/wpcm450/chip.h b/src/superio/nuvoton/wpcm450/chip.h index cc4054f..59d570b 100644 --- a/src/superio/nuvoton/wpcm450/chip.h +++ b/src/superio/nuvoton/wpcm450/chip.h @@ -25,7 +25,6 @@
struct superio_nuvoton_wpcm450_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c index fabb546..086abcf 100644 --- a/src/superio/nuvoton/wpcm450/superio.c +++ b/src/superio/nuvoton/wpcm450/superio.c @@ -37,7 +37,7 @@ static void init(device_t dev)
switch(dev->path.pnp.device) { case WPCM450_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/renesas/m3885x/chip.h b/src/superio/renesas/m3885x/chip.h index 8ca54c7..95a630e 100644 --- a/src/superio/renesas/m3885x/chip.h +++ b/src/superio/renesas/m3885x/chip.h @@ -24,7 +24,6 @@ #include <pc80/keyboard.h>
struct superio_renesas_m3885x_config { - struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c index 34d7d11..b51141e 100644 --- a/src/superio/renesas/m3885x/superio.c +++ b/src/superio/renesas/m3885x/superio.c @@ -38,7 +38,7 @@ static void m3885x_init(device_t dev)
printk(BIOS_DEBUG, "Renesas M3885x: Initializing keyboard.\n"); set_kbc_ps2_mode(); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); m3885_configure_multikey(); }
diff --git a/src/superio/smsc/fdc37m60x/chip.h b/src/superio/smsc/fdc37m60x/chip.h index a143f65..7044a26 100644 --- a/src/superio/smsc/fdc37m60x/chip.h +++ b/src/superio/smsc/fdc37m60x/chip.h @@ -26,7 +26,6 @@
struct superio_smsc_fdc37m60x_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c index 92a1783..cf94c4a 100644 --- a/src/superio/smsc/fdc37m60x/superio.c +++ b/src/superio/smsc/fdc37m60x/superio.c @@ -38,7 +38,7 @@ static void init(device_t dev) case FDC37M60X_PP: /* TODO. */ break; case FDC37M60X_KBCK: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; case FDC37M60X_AUX: /* TODO. */ break; diff --git a/src/superio/smsc/fdc37n972/chip.h b/src/superio/smsc/fdc37n972/chip.h index e4126a7..f8538fd 100644 --- a/src/superio/smsc/fdc37n972/chip.h +++ b/src/superio/smsc/fdc37n972/chip.h @@ -25,7 +25,6 @@
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 cab4540..a5d1163 100644 --- a/src/superio/smsc/fdc37n972/fdc37n972.c +++ b/src/superio/smsc/fdc37n972/fdc37n972.c @@ -37,7 +37,7 @@ static void init(device_t dev) case FDC37N972_PP: /* TODO. */ break; case FDC37N972_KBDC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; // [..] The rest: TODO } diff --git a/src/superio/smsc/kbc1100/chip.h b/src/superio/smsc/kbc1100/chip.h index 59ffb42..75e51d2 100644 --- a/src/superio/smsc/kbc1100/chip.h +++ b/src/superio/smsc/kbc1100/chip.h @@ -24,7 +24,6 @@
struct superio_smsc_kbc1100_config {
- struct pc_keyboard keyboard; };
#endif \ No newline at end of file diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c index 3a834a0..82df4f0 100644 --- a/src/superio/smsc/kbc1100/superio.c +++ b/src/superio/smsc/kbc1100/superio.c @@ -74,7 +74,7 @@ static void kbc1100_init(device_t dev) case KBC1100_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/lpc47b272/chip.h b/src/superio/smsc/lpc47b272/chip.h index 5a42f4a..ea5740e 100644 --- a/src/superio/smsc/lpc47b272/chip.h +++ b/src/superio/smsc/lpc47b272/chip.h @@ -25,7 +25,6 @@
struct superio_smsc_lpc47b272_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c index fb39c28..e53e485 100644 --- a/src/superio/smsc/lpc47b272/superio.c +++ b/src/superio/smsc/lpc47b272/superio.c @@ -92,7 +92,7 @@ static void lpc47b272_init(device_t dev)
switch(dev->path.pnp.device) { case LPC47B272_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/lpc47b397/chip.h b/src/superio/smsc/lpc47b397/chip.h index e4ad5b1..b8d1968 100644 --- a/src/superio/smsc/lpc47b397/chip.h +++ b/src/superio/smsc/lpc47b397/chip.h @@ -27,7 +27,6 @@
struct superio_smsc_lpc47b397_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c index 3d81350..58ac16b 100644 --- a/src/superio/smsc/lpc47b397/superio.c +++ b/src/superio/smsc/lpc47b397/superio.c @@ -63,7 +63,7 @@ static void lpc47b397_init(device_t dev)
switch(dev->path.pnp.device) { case LPC47B397_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/lpc47m10x/chip.h b/src/superio/smsc/lpc47m10x/chip.h index 2d947be..66c9cb7 100644 --- a/src/superio/smsc/lpc47m10x/chip.h +++ b/src/superio/smsc/lpc47m10x/chip.h @@ -29,7 +29,6 @@
struct superio_smsc_lpc47m10x_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c index 1a697f2..8095cfb 100644 --- a/src/superio/smsc/lpc47m10x/superio.c +++ b/src/superio/smsc/lpc47m10x/superio.c @@ -91,7 +91,7 @@ static void lpc47m10x_init(device_t dev)
switch(dev->path.pnp.device) { case LPC47M10X2_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/lpc47m15x/chip.h b/src/superio/smsc/lpc47m15x/chip.h index 757fa73..d5c42ca 100644 --- a/src/superio/smsc/lpc47m15x/chip.h +++ b/src/superio/smsc/lpc47m15x/chip.h @@ -24,7 +24,6 @@
struct superio_smsc_lpc47m15x_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c index b142dde..8401c89 100644 --- a/src/superio/smsc/lpc47m15x/superio.c +++ b/src/superio/smsc/lpc47m15x/superio.c @@ -72,7 +72,7 @@ static void lpc47m15x_init(device_t dev)
switch(dev->path.pnp.device) { case LPC47M15X_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/lpc47n227/chip.h b/src/superio/smsc/lpc47n227/chip.h index 3f26d8b..5e63066 100644 --- a/src/superio/smsc/lpc47n227/chip.h +++ b/src/superio/smsc/lpc47n227/chip.h @@ -25,7 +25,6 @@
struct superio_smsc_lpc47n227_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c index eda2622..0066313 100644 --- a/src/superio/smsc/lpc47n227/superio.c +++ b/src/superio/smsc/lpc47n227/superio.c @@ -136,7 +136,7 @@ static void lpc47n227_init(device_t dev) switch (dev->path.pnp.device) { case LPC47N227_KBDC: printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n"); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/mec1308/chip.h b/src/superio/smsc/mec1308/chip.h index 733cd34..293ebc5 100644 --- a/src/superio/smsc/mec1308/chip.h +++ b/src/superio/smsc/mec1308/chip.h @@ -23,7 +23,6 @@ #include <pc80/keyboard.h>
struct superio_smsc_mec1308_config { - struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c index 448800e..2bbc696 100644 --- a/src/superio/smsc/mec1308/superio.c +++ b/src/superio/smsc/mec1308/superio.c @@ -47,7 +47,7 @@ static void mec1308_init(device_t dev) if (acpi_slp_type == 3) return; #endif - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/sch4037/chip.h b/src/superio/smsc/sch4037/chip.h index b1fee00..f9c7476 100644 --- a/src/superio/smsc/sch4037/chip.h +++ b/src/superio/smsc/sch4037/chip.h @@ -24,7 +24,6 @@
struct superio_smsc_sch4037_config {
- struct pc_keyboard keyboard; };
#endif //SUPERIO_SCH_4037_CHIP_H \ No newline at end of file diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index b7f100a..a1814cc 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -73,7 +73,7 @@ static void sch4037_init(device_t dev) case SCH4037_KBC: res0 = find_resource(dev, PNP_IDX_IO0); res1 = find_resource(dev, PNP_IDX_IO1); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/smsc/sio10n268/chip.h b/src/superio/smsc/sio10n268/chip.h index cde51d1..cef6497 100644 --- a/src/superio/smsc/sio10n268/chip.h +++ b/src/superio/smsc/sio10n268/chip.h @@ -25,7 +25,6 @@
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 690c160..6fb6e57 100644 --- a/src/superio/smsc/sio10n268/sio10n268.c +++ b/src/superio/smsc/sio10n268/sio10n268.c @@ -38,7 +38,7 @@ static void init(device_t dev) break; case SIO10N268_KBDC: /* TODO: This is still hardcoded. */ - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; // [..] The rest: TODO } diff --git a/src/superio/smsc/smscsuperio/chip.h b/src/superio/smsc/smscsuperio/chip.h index 1e5acfe..faa4346 100644 --- a/src/superio/smsc/smscsuperio/chip.h +++ b/src/superio/smsc/smscsuperio/chip.h @@ -26,7 +26,6 @@
struct superio_smsc_smscsuperio_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c index 9990aa2..5e99d17 100644 --- a/src/superio/smsc/smscsuperio/superio.c +++ b/src/superio/smsc/smscsuperio/superio.c @@ -169,7 +169,7 @@ static void smsc_init(device_t dev) /* A Super I/O was found, so initialize the respective device. */ ld = dev->path.pnp.device; if (ld == logical_device_table[i].devs[LD_KBC]) { - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); } }
diff --git a/src/superio/winbond/w83627dhg/chip.h b/src/superio/winbond/w83627dhg/chip.h index 0bc5374..658459d 100644 --- a/src/superio/winbond/w83627dhg/chip.h +++ b/src/superio/winbond/w83627dhg/chip.h @@ -25,7 +25,6 @@
struct superio_winbond_w83627dhg_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c index 269e57c..74edbba 100644 --- a/src/superio/winbond/w83627dhg/superio.c +++ b/src/superio/winbond/w83627dhg/superio.c @@ -49,7 +49,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/chip.h b/src/superio/winbond/w83627ehg/chip.h index e073d7d..16540c6 100644 --- a/src/superio/winbond/w83627ehg/chip.h +++ b/src/superio/winbond/w83627ehg/chip.h @@ -26,7 +26,6 @@
struct superio_winbond_w83627ehg_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 62d3311..06bbc33 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -103,7 +103,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/chip.h b/src/superio/winbond/w83627hf/chip.h index ae527ea..60da436 100644 --- a/src/superio/winbond/w83627hf/chip.h +++ b/src/superio/winbond/w83627hf/chip.h @@ -27,7 +27,6 @@
struct superio_winbond_w83627hf_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index c881743..5fef7ea 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -110,7 +110,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/chip.h b/src/superio/winbond/w83627thg/chip.h index 1677b97..dbd3fc1 100644 --- a/src/superio/winbond/w83627thg/chip.h +++ b/src/superio/winbond/w83627thg/chip.h @@ -27,7 +27,6 @@
struct superio_winbond_w83627thg_config {
- struct pc_keyboard keyboard; };
#endif /* SUPERIO_WINBOND_W83627THG_CHIP_H */ diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c index f6aba10..e57a784 100644 --- a/src/superio/winbond/w83627thg/superio.c +++ b/src/superio/winbond/w83627thg/superio.c @@ -39,7 +39,7 @@ static void w83627thg_init(device_t dev)
switch(dev->path.pnp.device) { case W83627THG_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/winbond/w83627uhg/chip.h b/src/superio/winbond/w83627uhg/chip.h index cf8edfb..9a002cb 100644 --- a/src/superio/winbond/w83627uhg/chip.h +++ b/src/superio/winbond/w83627uhg/chip.h @@ -25,7 +25,6 @@
struct superio_winbond_w83627uhg_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c index 5775ff5..ab29aad 100644 --- a/src/superio/winbond/w83627uhg/superio.c +++ b/src/superio/winbond/w83627uhg/superio.c @@ -85,7 +85,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/w83977f/chip.h b/src/superio/winbond/w83977f/chip.h index 7363445..0ba463f 100644 --- a/src/superio/winbond/w83977f/chip.h +++ b/src/superio/winbond/w83977f/chip.h @@ -25,7 +25,6 @@
struct superio_winbond_w83977f_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c index 32ecf18..d964f91 100644 --- a/src/superio/winbond/w83977f/superio.c +++ b/src/superio/winbond/w83977f/superio.c @@ -38,7 +38,7 @@ static void w83977f_init(device_t dev)
switch(dev->path.pnp.device) { case W83977F_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } } diff --git a/src/superio/winbond/w83977tf/chip.h b/src/superio/winbond/w83977tf/chip.h index ddcf1b5..f38cd43 100644 --- a/src/superio/winbond/w83977tf/chip.h +++ b/src/superio/winbond/w83977tf/chip.h @@ -27,7 +27,6 @@
struct superio_winbond_w83977tf_config {
- struct pc_keyboard keyboard; };
#endif diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index 7f2dffb..4996293 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -40,7 +40,7 @@ static void w83977tf_init(device_t dev)
switch(dev->path.pnp.device) { case W83977TF_KBC: - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); break; } }