diff options
Diffstat (limited to 'src/superio/winbond/w83627thg/superio.c')
| -rw-r--r-- | src/superio/winbond/w83627thg/superio.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c index d6a74a194e..08044a8f53 100644 --- a/src/superio/winbond/w83627thg/superio.c +++ b/src/superio/winbond/w83627thg/superio.c @@ -3,7 +3,7 @@ * * Copyright (C) 2000 AG Electronics Ltd. * Copyright (C) 2003-2004 Linux Networx - * Copyright (C) 2004 Tyan By LYH change from PC87360 + * Copyright (C) 2004 Tyan * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ static void w83627thg_enter_ext_func_mode(device_t dev) outb(0x87, dev->path.pnp.port); outb(0x87, dev->path.pnp.port); } + static void w83627thg_exit_ext_func_mode(device_t dev) { outb(0xaa, dev->path.pnp.port); @@ -43,15 +44,12 @@ static void w83627thg_exit_ext_func_mode(device_t dev) static void w83627thg_init(device_t dev) { - struct superio_winbond_w83627thg_config *conf; + struct superio_winbond_w83627thg_config *conf = dev->chip_info; struct resource *res0, *res1; - /* Wishlist handle well known programming interfaces more - * generically. - */ - if (!dev->enabled) { + + if (!dev->enabled) return; - } - conf = dev->chip_info; + switch(dev->path.pnp.device) { case W83627THG_SP1: res0 = find_resource(dev, PNP_IDX_IO0); @@ -103,7 +101,6 @@ static struct pnp_info pnp_dev_info[] = { { &ops, W83627THG_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, }, { &ops, W83627THG_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, W83627THG_SP2, PNP_IO0 | PNP_IRQ0 | PNP_MSC1, { 0x7f8, 0 }, }, - /* No 4 { 0,}, */ { &ops, W83627THG_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1 | PNP_MSC0, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, { &ops, W83627THG_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 4} }, { &ops, W83627THG_GPIO2,}, @@ -114,8 +111,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { - pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83627thg_ops = { |