Remove superfluous Super I/O res0/res1 lines.

[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 63036e61f348271859fd811cbd650f7db583acd7..675ddba77371a268ace23bd1306948e5ea4d8db2 100644 (file)
--- a/src/superio/ite/it8673f/superio.c
+++ b/src/superio/ite/it8673f/superio.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the coreboot project.
  *
  * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -18,23 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <device/device.h>
+#include <device/pnp.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
+#include <stdlib.h>
 #include "chip.h"
 #include "it8673f.h"
 
 static void init(device_t dev)
 {
-       struct superio_ite_it8673f_config *conf;
-       struct resource *res0, *res1;
+       struct superio_ite_it8673f_config *conf = dev->chip_info;
+       struct resource *res0;
 
-       if (!dev->enabled) {
+       if (!dev->enabled)
                return;
-       }
-
-       conf = dev->chip_info;
 
-       switch (dev->path.u.pnp.device) {
+       switch (dev->path.pnp.device) {
        case IT8673F_FDC: /* TODO. */
                break;
        case IT8673F_SP1:
@@ -50,9 +50,7 @@ static void init(device_t dev)
        case IT8673F_FAN: /* TODO. */
                break;
        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;
@@ -77,11 +75,10 @@ static struct pnp_info pnp_dev_info[] = {
 static void enable_dev(struct device *dev)
 {
        pnp_enable_devices(dev, &pnp_ops,
-               sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
+               ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_ite_it8673f_ops = {
        CHIP_NAME("ITE IT8673F Super I/O")
        .enable_dev = enable_dev,
 };
-