Random ITE Super I/O fixes.

[coreboot.git] / src / superio / ite / it8673f / superio.c

diff --git a/src/superio/ite/it8673f/superio.c b/src/superio/ite/it8673f/superio.c
index a5c99b1dba83b4ed12edd03d974cd3a3a10346b3..e1d2f50a0f07a5e6acf6d60e98fc7b1cb400b9d5 100644 (file)
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -28,14 +28,11 @@
 
 static void init(device_t dev)
 {
-       struct superio_ite_it8673f_config *conf;
+       struct superio_ite_it8673f_config *conf = dev->chip_info;
        struct resource *res0, *res1;
 
-       if (!dev->enabled) {
+       if (!dev->enabled)
                return;
-       }
-
-       conf = dev->chip_info;
 
        switch (dev->path.pnp.device) {
        case IT8673F_FDC: /* TODO. */
@@ -55,7 +52,7 @@ static void init(device_t dev)
        case IT8673F_KBCK:
                res0 = find_resource(dev, PNP_IDX_IO0);
                res1 = find_resource(dev, PNP_IDX_IO1);
-               init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+               pc_keyboard_init(&conf->keyboard);
                break;
        case IT8673F_KBCM: /* TODO. */
                break;