From def00be41db96971a92b78f3f23343c344d82c43 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Wed, 30 Apr 2014 05:01:52 +1000 Subject: src/drivers/pc80: Remove empty struct keyboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a empty struct that has propagated through the superio's & ec's but really does nothing. Time to get rid of it before it adds yet more cruft. However, since this touches many superio's at once we do this in stages by first changing the function type to be a pure procedure. Change-Id: Ibc732e676a9d4f0269114acabc92b15771d27ef2 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5617 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki Reviewed-by: Rudolf Marek --- src/ec/compal/ene932/ec.c | 5 +---- src/ec/google/chromeec/ec_lpc.c | 5 ++--- src/ec/quanta/ene_kb3940q/ec.c | 4 +--- src/ec/quanta/it8518/ec.c | 5 +---- 4 files changed, 5 insertions(+), 14 deletions(-) (limited to 'src/ec') diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 3f4d1b99ba..e60a0ac9e0 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -133,14 +133,11 @@ static u8 ec_io_read(u16 addr) #ifndef __SMM__ static void ene932_init(device_t dev) { - struct ec_compal_ene932_config *conf = dev->chip_info; - - if (!dev->enabled) return; printk(BIOS_DEBUG, "Compal ENE932: Initializing keyboard.\n"); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); } diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index a445da87be..5f377c923e 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -138,11 +138,10 @@ int google_chromeec_command(struct chromeec_command *cec_command) #ifndef __SMM__ static void lpc_ec_init(device_t dev) { - struct ec_google_chromeec_config *conf = dev->chip_info; - if (!dev->enabled) return; - pc_keyboard_init(&conf->keyboard); + + pc_keyboard_init(); google_chromeec_init(); } diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 137aa8108d..57854d051f 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -141,13 +141,11 @@ static void ene_kb3940q_log_events(void) static void ene_kb3940q_init(device_t dev) { - struct ec_quanta_ene_kb3940q_config *conf = dev->chip_info; - if (!dev->enabled) return; printk(BIOS_DEBUG, "Quanta EnE KB3940Q: Initializing keyboard.\n"); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); ene_kb3940q_log_events(); } diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 6516cee349..7588a1ea4a 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -162,14 +162,11 @@ void ec_it8518_enable_wake_events(void) #ifndef __SMM__ static void it8518_init(device_t dev) { - struct ec_quanta_it8518_config *conf = dev->chip_info; - - if (!dev->enabled) return; printk(BIOS_DEBUG, "Quanta IT8518: Initializing keyboard.\n"); - pc_keyboard_init(&conf->keyboard); + pc_keyboard_init(); } -- cgit v1.2.3