C and other Super I/O cosmetic fixes.

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

diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 64cdc5da1a7fce77172136416b1bd329d36a71b8..aa51577363662e4d9ed0fff75049da7129d4e4cc 100644 (file)
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -30,26 +30,26 @@
 #include "chip.h"
 #include "w83977f.h"
 
-static void w83977f_enter_ext_func_mode(device_t dev) 
+static void w83977f_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 w83977f_exit_ext_func_mode(device_t dev) 
+
+static void w83977f_exit_ext_func_mode(device_t dev)
 {
-       outb(0xaa, dev->path.u.pnp.port);
+       outb(0xaa, dev->path.pnp.port);
 }
 
 static void w83977f_init(device_t dev)
 {
-       struct superio_winbond_w83977f_config *conf;
-       struct resource *res0, *res1;
+       struct superio_winbond_w83977f_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 W83977F_SP1:
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com1);
@@ -59,9 +59,7 @@ static void w83977f_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case W83977F_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;
        }
 }
@@ -96,24 +94,23 @@ static struct device_operations ops = {
 };
 
 static struct pnp_info pnp_dev_info[] = {
-       { &ops, W83977F_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_SP2,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_RTC,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7f8, 0 }, { 0x7f8, 0x0}, },
-       { &ops, W83977F_IR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, W83977F_GPIO1, PNP_IO0, { 0x7f8, 0 }, },
-       { &ops, W83977F_GPIO2, PNP_IO0, { 0x7f8, 0 }, },
+       { &ops, W83977F_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_SP1,  PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_SP2,  PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_RTC,  PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07f8, 0}, {0x07f8, 0}, },
+       { &ops, W83977F_IR, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, W83977F_GPIO1, PNP_IO0, {0x07f8, 0}, },
+       { &ops, W83977F_GPIO2, PNP_IO0, {0x07f8, 0}, },
 };
 
 static void enable_dev(device_t dev)
 {
-       pnp_enable_devices(dev, &ops,
-               ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+       pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_winbond_w83977f_ops = {
-       CHIP_NAME("Winbond W83977F-A Super I/O")
+       CHIP_NAME("Winbond W83977F Super I/O")
        .enable_dev = enable_dev,
 };