Remove superfluous Super I/O res0/res1 lines.

[coreboot.git] / src / superio / winbond / w83627uhg / superio.c

diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 796b20a8dcb8b55288d82d54bc89e24143eafe91..ed22b2166c6bb96d1d59dd7f37f0aefe04a9cefd 100644 (file)
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -33,13 +33,13 @@
 
 static void w83627uhg_enter_ext_func_mode(device_t dev)
 {
-       outb(0x87, dev->path.u.pnp.port);
-       outb(0x87, dev->path.u.pnp.port);
+       outb(0x87, dev->path.pnp.port);
+       outb(0x87, dev->path.pnp.port);
 }
 
 static void w83627uhg_exit_ext_func_mode(device_t dev)
 {
-       outb(0xaa, dev->path.u.pnp.port);
+       outb(0xaa, dev->path.pnp.port);
 }
 
 /*
@@ -72,15 +72,14 @@ static void set_uart_clock_source(device_t dev, u8 uart_clock)
 
 static void w83627uhg_init(device_t dev)
 {
-       struct superio_winbond_w83627uhg_config *conf;
-       struct resource *res0, *res1;
+       struct superio_winbond_w83627uhg_config *conf = dev->chip_info;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
 
-       conf = dev->chip_info;
-       switch(dev->path.u.pnp.device) {
-       case W83627UHG_SP1: 
+       switch(dev->path.pnp.device) {
+       case W83627UHG_SP1:
                res0 = find_resource(dev, PNP_IDX_IO0);
                /* set_uart_clock_source(dev, 0); */
                init_uart8250(res0->base, &conf->com1);
@@ -111,9 +110,7 @@ static void w83627uhg_init(device_t dev)
                init_uart8250(res0->base, &conf->com6);
                break;
        case W83627UHG_KBC:
-               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;
        }
 }