Nico Huber submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
ec/kontron/kempld: Reflow long lines

Change-Id: Ia5ad0715b742427dffa6c0c507269d904fe19bcb
Signed-off-by: Maxim Polyakov <max.senia.poliak@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45372
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M src/ec/kontron/kempld/early_kempld.c
M src/ec/kontron/kempld/kempld.c
M src/ec/kontron/kempld/kempld_i2c.c
3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/ec/kontron/kempld/early_kempld.c b/src/ec/kontron/kempld/early_kempld.c
index cb33a8b..3cafb1e 100644
--- a/src/ec/kontron/kempld/early_kempld.c
+++ b/src/ec/kontron/kempld/early_kempld.c
@@ -43,13 +43,11 @@
switch (CONFIG_UART_FOR_CONSOLE) {
case 0:
kempld_write8(KEMPLD_UART_0,
- KEMPLD_UART_ENABLE |
- KEMPLD_UART_3F8 << KEMPLD_UART_IO_SHIFT);
+ KEMPLD_UART_ENABLE | KEMPLD_UART_3F8 << KEMPLD_UART_IO_SHIFT);
break;
case 1:
kempld_write8(KEMPLD_UART_1,
- KEMPLD_UART_ENABLE |
- KEMPLD_UART_2F8 << KEMPLD_UART_IO_SHIFT);
+ KEMPLD_UART_ENABLE | KEMPLD_UART_2F8 << KEMPLD_UART_IO_SHIFT);
break;
default:
break;
diff --git a/src/ec/kontron/kempld/kempld.c b/src/ec/kontron/kempld/kempld.c
index 19376c7..f8371a8 100644
--- a/src/ec/kontron/kempld/kempld.c
+++ b/src/ec/kontron/kempld/kempld.c
@@ -16,21 +16,20 @@
struct resource *const res_io = new_resource(dev, 0);
struct resource *const res_irq = new_resource(dev, 1);
const unsigned int uart = dev->path.generic.subid;
+
if (!config || !res_io || !res_irq || uart >= KEMPLD_NUM_UARTS)
return;

const enum kempld_uart_io io = config->uart[uart].io;
if (io >= ARRAY_SIZE(io_addr)) {
- printk(BIOS_ERR, "KEMPLD: Bad io value '%d' for UART#%u\n.",
- io, uart);
+ printk(BIOS_ERR, "KEMPLD: Bad io value '%d' for UART#%u\n.", io, uart);
dev->enabled = false;
return;
}

const int irq = config->uart[uart].irq;
if (irq >= 16) {
- printk(BIOS_ERR, "KEMPLD: Bad irq value '%d' for UART#%u\n.",
- irq, uart);
+ printk(BIOS_ERR, "KEMPLD: Bad irq value '%d' for UART#%u\n.", irq, uart);
dev->enabled = false;
return;
}
@@ -49,9 +48,10 @@

const uint8_t reg = uart ? KEMPLD_UART_1 : KEMPLD_UART_0;
const uint8_t val = kempld_read8(reg);
- kempld_write8(reg, (val & ~(KEMPLD_UART_IO_MASK | KEMPLD_UART_IRQ_MASK))
- | io << KEMPLD_UART_IO_SHIFT
- | irq << KEMPLD_UART_IRQ_SHIFT);
+ kempld_write8(reg,
+ (val & ~(KEMPLD_UART_IO_MASK | KEMPLD_UART_IRQ_MASK)) |
+ io << KEMPLD_UART_IO_SHIFT |
+ irq << KEMPLD_UART_IRQ_SHIFT);

kempld_release_mutex();
}
@@ -90,9 +90,7 @@
}
/* Fall through. */
default:
- printk(BIOS_WARNING,
- "KEMPLD: Spurious device %s.\n",
- dev_path(dev));
+ printk(BIOS_WARNING, "KEMPLD: Spurious device %s.\n", dev_path(dev));
break;
}
}
diff --git a/src/ec/kontron/kempld/kempld_i2c.c b/src/ec/kontron/kempld/kempld_i2c.c
index 8abbb4b..b99c0e4 100644
--- a/src/ec/kontron/kempld/kempld_i2c.c
+++ b/src/ec/kontron/kempld/kempld_i2c.c
@@ -151,8 +151,7 @@
i2c->state = STATE_ADDR;
return 0;
}
- i2c->state = (msg->flags & I2C_M_RD)
- ? STATE_READ : STATE_WRITE;
+ i2c->state = (msg->flags & I2C_M_RD) ? STATE_READ : STATE_WRITE;
} else {
i2c->state = STATE_DONE;
kempld_write8(KEMPLD_I2C_CMD, I2C_CMD_STOP);

To view, visit change 45372. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ia5ad0715b742427dffa6c0c507269d904fe19bcb
Gerrit-Change-Number: 45372
Gerrit-PatchSet: 8
Gerrit-Owner: Maxim Polyakov <max.senia.poliak@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged