<p>Arthur Heymans has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20852">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sio/smsc/kbc1100: Fix some style issues<br><br>This fixes indentation and whitespaces before opening parentheses.<br><br>Change-Id: I8940f712c0161419ee0c383b7bc9eb581967366e<br>Signed-off-by: Arthur Heymans <arthur@aheymans.xyz><br>---<br>M src/superio/smsc/kbc1100/early_init.c<br>M src/superio/smsc/kbc1100/superio.c<br>2 files changed, 43 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/20852/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c<br>index 2b4ba6f..658de9b 100644<br>--- a/src/superio/smsc/kbc1100/early_init.c<br>+++ b/src/superio/smsc/kbc1100/early_init.c<br>@@ -46,30 +46,30 @@<br> <br> void kbc1100_early_init(u16 port)<br> {<br>- pnp_devfn_t dev;<br>- dev = PNP_DEV (port, KBC1100_KBC);<br>- pnp_enter_conf_state(dev);<br>+ pnp_devfn_t dev;<br>+ dev = PNP_DEV(port, KBC1100_KBC);<br>+ pnp_enter_conf_state(dev);<br> <br>- /* Serial IRQ enabled */<br>- outb(0x25, port);<br>- outb(0x04, port + 1);<br>+ /* Serial IRQ enabled */<br>+ outb(0x25, port);<br>+ outb(0x04, port + 1);<br> <br>- /* Enable keyboard */<br>- pnp_set_logical_device(dev);<br>- pnp_set_enable(dev, 0);<br>- pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);<br>- pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);<br>- pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */<br>- pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */<br>- pnp_set_enable(dev, 1);<br>+ /* Enable keyboard */<br>+ pnp_set_logical_device(dev);<br>+ pnp_set_enable(dev, 0);<br>+ pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);<br>+ pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);<br>+ pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */<br>+ pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */<br>+ pnp_set_enable(dev, 1);<br> <br>- /* Enable EC Channel 0 */<br>- dev = PNP_DEV (port, KBC1100_EC0);<br>- pnp_set_logical_device(dev);<br>- pnp_set_enable(dev, 1);<br>+ /* Enable EC Channel 0 */<br>+ dev = PNP_DEV(port, KBC1100_EC0);<br>+ pnp_set_logical_device(dev);<br>+ pnp_set_enable(dev, 1);<br> <br>- pnp_exit_conf_state(dev);<br>+ pnp_exit_conf_state(dev);<br> <br>- /* disable the 1s timer */<br>- outb(0xE7, 0x64);<br>+ /* disable the 1s timer */<br>+ outb(0xE7, 0x64);<br> }<br>diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c<br>index 448070a..0f5ede1 100644<br>--- a/src/superio/smsc/kbc1100/superio.c<br>+++ b/src/superio/smsc/kbc1100/superio.c<br>@@ -31,44 +31,42 @@<br> static void kbc1100_init(struct device *dev);<br> <br> struct chip_operations superio_smsc_kbc1100_ops = {<br>- CHIP_NAME("SMSC KBC1100 Super I/O")<br>- .enable_dev = enable_dev<br>+ CHIP_NAME("SMSC KBC1100 Super I/O")<br>+ .enable_dev = enable_dev<br> };<br> <br> static struct device_operations ops = {<br>- .read_resources = pnp_read_resources,<br>- .set_resources = pnp_set_resources,<br>- .enable_resources = pnp_enable_resources,<br>- .enable = pnp_alt_enable,<br>- .init = kbc1100_init,<br>- .ops_pnp_mode = &pnp_conf_mode_55_aa,<br>+ .read_resources = pnp_read_resources,<br>+ .set_resources = pnp_set_resources,<br>+ .enable_resources = pnp_enable_resources,<br>+ .enable = pnp_alt_enable,<br>+ .init = kbc1100_init,<br>+ .ops_pnp_mode = &pnp_conf_mode_55_aa,<br> };<br> <br> static struct pnp_info pnp_dev_info[] = {<br>- { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, },<br>+ { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff,<br>+ 0x7ff, },<br> };<br> <br> static void enable_dev(struct device *dev)<br> {<br>- pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);<br>+ pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),<br>+ pnp_dev_info);<br> }<br> <br> static void kbc1100_init(struct device *dev)<br> {<br>- struct resource *res0, *res1;<br>+ struct resource *res0, *res1;<br> <br>+ if (!dev->enabled)<br>+ return;<br> <br>-<br>- if (!dev->enabled) {<br>- return;<br>- }<br>-<br>- switch(dev->path.pnp.device) {<br>-<br>- case KBC1100_KBC:<br>- res0 = find_resource(dev, PNP_IDX_IO0);<br>- res1 = find_resource(dev, PNP_IDX_IO1);<br>- pc_keyboard_init(NO_AUX_DEVICE);<br>- break;<br>- }<br>+ switch (dev->path.pnp.device) {<br>+ case KBC1100_KBC:<br>+ res0 = find_resource(dev, PNP_IDX_IO0);<br>+ res1 = find_resource(dev, PNP_IDX_IO1);<br>+ pc_keyboard_init(NO_AUX_DEVICE);<br>+ break;<br>+ }<br> }<br></pre><p>To view, visit <a href="https://review.coreboot.org/20852">change 20852</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20852"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8940f712c0161419ee0c383b7bc9eb581967366e </div>
<div style="display:none"> Gerrit-Change-Number: 20852 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Arthur Heymans <arthur@aheymans.xyz> </div>