summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/superio/smsc/kbc1100/early_init.c42
-rw-r--r--src/superio/smsc/kbc1100/superio.c46
2 files changed, 43 insertions, 45 deletions
diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c
index 2b4ba6fe21..658de9b654 100644
--- a/src/superio/smsc/kbc1100/early_init.c
+++ b/src/superio/smsc/kbc1100/early_init.c
@@ -46,30 +46,30 @@ void kbc1100_early_serial(pnp_devfn_t dev, u16 iobase)
void kbc1100_early_init(u16 port)
{
- pnp_devfn_t dev;
- dev = PNP_DEV (port, KBC1100_KBC);
- pnp_enter_conf_state(dev);
+ pnp_devfn_t dev;
+ dev = PNP_DEV(port, KBC1100_KBC);
+ pnp_enter_conf_state(dev);
- /* Serial IRQ enabled */
- outb(0x25, port);
- outb(0x04, port + 1);
+ /* Serial IRQ enabled */
+ outb(0x25, port);
+ outb(0x04, port + 1);
- /* Enable keyboard */
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 0);
- pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);
- pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);
- pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */
- pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */
- pnp_set_enable(dev, 1);
+ /* Enable keyboard */
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 0);
+ pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);
+ pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);
+ pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */
+ pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */
+ pnp_set_enable(dev, 1);
- /* Enable EC Channel 0 */
- dev = PNP_DEV (port, KBC1100_EC0);
- pnp_set_logical_device(dev);
- pnp_set_enable(dev, 1);
+ /* Enable EC Channel 0 */
+ dev = PNP_DEV(port, KBC1100_EC0);
+ pnp_set_logical_device(dev);
+ pnp_set_enable(dev, 1);
- pnp_exit_conf_state(dev);
+ pnp_exit_conf_state(dev);
- /* disable the 1s timer */
- outb(0xE7, 0x64);
+ /* disable the 1s timer */
+ outb(0xE7, 0x64);
}
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index 448070a8ce..0f5ede19f2 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -31,44 +31,42 @@ static void enable_dev(struct device *dev);
static void kbc1100_init(struct device *dev);
struct chip_operations superio_smsc_kbc1100_ops = {
- CHIP_NAME("SMSC KBC1100 Super I/O")
- .enable_dev = enable_dev
+ CHIP_NAME("SMSC KBC1100 Super I/O")
+ .enable_dev = enable_dev
};
static struct device_operations ops = {
- .read_resources = pnp_read_resources,
- .set_resources = pnp_set_resources,
- .enable_resources = pnp_enable_resources,
- .enable = pnp_alt_enable,
- .init = kbc1100_init,
- .ops_pnp_mode = &pnp_conf_mode_55_aa,
+ .read_resources = pnp_read_resources,
+ .set_resources = pnp_set_resources,
+ .enable_resources = pnp_enable_resources,
+ .enable = pnp_alt_enable,
+ .init = kbc1100_init,
+ .ops_pnp_mode = &pnp_conf_mode_55_aa,
};
static struct pnp_info pnp_dev_info[] = {
- { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, },
+ { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff,
+ 0x7ff, },
};
static void enable_dev(struct device *dev)
{
- pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
+ pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
+ pnp_dev_info);
}
static void kbc1100_init(struct device *dev)
{
- struct resource *res0, *res1;
+ struct resource *res0, *res1;
+ if (!dev->enabled)
+ return;
-
- if (!dev->enabled) {
- return;
- }
-
- switch(dev->path.pnp.device) {
-
- case KBC1100_KBC:
- res0 = find_resource(dev, PNP_IDX_IO0);
- res1 = find_resource(dev, PNP_IDX_IO1);
- pc_keyboard_init(NO_AUX_DEVICE);
- break;
- }
+ switch (dev->path.pnp.device) {
+ case KBC1100_KBC:
+ res0 = find_resource(dev, PNP_IDX_IO0);
+ res1 = find_resource(dev, PNP_IDX_IO1);
+ pc_keyboard_init(NO_AUX_DEVICE);
+ break;
+ }
}