printk_foo -> printk(BIOS_FOO, ...)

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

diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index fcb635f5a0071015c1f283809f3ff7d05d2ae7ce..8deae4a68397d9564e41913fb2a6b52e1eb3e1af 100644 (file)
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2000 AG Electronics Ltd.
  * Copyright (C) 2003-2004 Linux Networx
- * Copyright (C) 2004 Tyan 
+ * Copyright (C) 2004 Tyan
  * Copyright (C) 2007 AMD
  * Written by Yinghai Lu <yinghai.lu@amd.com> for AMD.
  *
@@ -57,7 +57,8 @@ static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
        return inb(port_base + 1);
 }
 
-static void enable_hwm_smbus(device_t dev) {
+static void enable_hwm_smbus(device_t dev)
+{
        /* Set the pin 91,92 as I2C bus. */
        uint8_t reg, value;
        reg = 0x2a;
@@ -69,9 +70,9 @@ static void enable_hwm_smbus(device_t dev) {
 static void init_acpi(device_t dev)
 {
        uint8_t value = 0x20;
-       uint32_t power_on = 1;
+       int power_on = 1;
 
-       get_option("power_on_after_fail", &power_on);
+       get_option(&power_on, "power_on_after_fail");
        pnp_enter_ext_func_mode(dev);
        pnp_write_index(dev->path.pnp.port, 7, 0x0a);
        value = pnp_read_config(dev, 0xe4);
@@ -99,7 +100,7 @@ static void init_hwm(unsigned long base)
                value = pnp_read_index(base, reg);
                value &= 0xff & (~(hwm_reg_values[i + 1]));
                value |= 0xff & hwm_reg_values[i + 2];
-               // printk_debug("base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value);
+               /* printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value); */
                pnp_write_index(base, reg, value);
        }
 }
@@ -124,7 +125,7 @@ static void w83627ehg_init(device_t dev)
        case W83627EHG_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;
        case W83627EHG_HWM:
                res0 = find_resource(dev, PNP_IDX_IO0);
@@ -137,21 +138,21 @@ static void w83627ehg_init(device_t dev)
        }
 }
 
-void w83627ehg_pnp_set_resources(device_t dev)
+static void w83627ehg_pnp_set_resources(device_t dev)
 {
        pnp_enter_ext_func_mode(dev);
        pnp_set_resources(dev);
        pnp_exit_ext_func_mode(dev);
 }
 
-void w83627ehg_pnp_enable_resources(device_t dev)
+static void w83627ehg_pnp_enable_resources(device_t dev)
 {
        pnp_enter_ext_func_mode(dev);
        pnp_enable_resources(dev);
 
        switch (dev->path.pnp.device) {
        case W83627EHG_HWM:
-               printk_debug("w83627ehg hwm smbus enabled\n");
+               printk(BIOS_DEBUG, "w83627ehg hwm smbus enabled\n");
                enable_hwm_smbus(dev);
                break;
        }
@@ -159,7 +160,7 @@ void w83627ehg_pnp_enable_resources(device_t dev)
        pnp_exit_ext_func_mode(dev);
 }
 
-void w83627ehg_pnp_enable(device_t dev)
+static void w83627ehg_pnp_enable(device_t dev)
 {
        if (!dev->enabled) {
                pnp_enter_ext_func_mode(dev);
@@ -182,7 +183,7 @@ static struct pnp_info pnp_dev_info[] = {
        { &ops, W83627EHG_PP,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
        { &ops, W83627EHG_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
        { &ops, W83627EHG_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       // No 4 { 0,},
+       /* No 4 { 0,}, */
        { &ops, W83627EHG_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
        { &ops, W83627EHG_SFI, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
        { &ops, W83627EHG_WDTO_PLED, },
@@ -208,4 +209,3 @@ struct chip_operations superio_winbond_w83627ehg_ops = {
        CHIP_NAME("Winbond W83627EHG Super I/O")
        .enable_dev = enable_dev,
 };
-