Commit-ID: bafa849313f6bffa3b1f9aeda205ab631cde0821
Gitweb: http://git.kernel.org/tip/bafa849313f6bffa3b1f9aeda205ab631cde0821
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Sat, 10 Dec 2011 13:27:56 +0000
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sat, 10 Dec 2011 17:14:42 +0200
kvm tool: serial: Cleanup coding style
It's nice to align struct initializers, but random tab insertion into
the code flow is a horrible idea.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/hw/serial.c | 69 ++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/tools/kvm/hw/serial.c b/tools/kvm/hw/serial.c
index 5be81d4..acef067 100644
--- a/tools/kvm/hw/serial.c
+++ b/tools/kvm/hw/serial.c
@@ -91,13 +91,13 @@ static void serial8250__sysrq(struct kvm *kvm, struct serial8250_device *dev)
{
switch (sysrq_pending) {
case SYSRQ_PENDING_BREAK:
- dev->lsr |= UART_LSR_DR | UART_LSR_BI;
+ dev->lsr |= UART_LSR_DR | UART_LSR_BI;
- sysrq_pending = SYSRQ_PENDING_CMD;
+ sysrq_pending = SYSRQ_PENDING_CMD;
break;
case SYSRQ_PENDING_CMD:
- dev->rbr = 'p';
- dev->lsr |= UART_LSR_DR;
+ dev->rbr = 'p';
+ dev->lsr |= UART_LSR_DR;
sysrq_pending = SYSRQ_PENDING_NONE;
break;
@@ -124,8 +124,8 @@ static void serial8250__receive(struct kvm *kvm, struct serial8250_device *dev)
if (c < 0)
return;
- dev->rbr = c;
- dev->lsr |= UART_LSR_DR;
+ dev->rbr = c;
+ dev->lsr |= UART_LSR_DR;
}
void serial8250__inject_interrupt(struct kvm *kvm)
@@ -140,11 +140,11 @@ void serial8250__inject_interrupt(struct kvm *kvm)
serial8250__receive(kvm, dev);
if (dev->ier & UART_IER_RDI && dev->lsr & UART_LSR_DR)
- dev->iir = UART_IIR_RDI;
+ dev->iir = UART_IIR_RDI;
else if (dev->ier & UART_IER_THRI)
- dev->iir = UART_IIR_THRI;
+ dev->iir = UART_IIR_THRI;
else
- dev->iir = UART_IIR_NO_INT;
+ dev->iir = UART_IIR_NO_INT;
if (dev->iir != UART_IIR_NO_INT) {
kvm__irq_line(kvm, dev->irq, 0);
@@ -179,30 +179,30 @@ static bool serial8250_out(struct ioport *ioport, struct kvm *kvm, u16 port, voi
u16 offset;
bool ret = true;
- dev = find_device(port);
+ dev = find_device(port);
if (!dev)
return false;
mutex_lock(&dev->mutex);
- offset = port - dev->iobase;
+ offset = port - dev->iobase;
if (dev->lcr & UART_LCR_DLAB) {
switch (offset) {
case UART_DLL:
- dev->dll = ioport__read8(data);
+ dev->dll = ioport__read8(data);
break;
case UART_DLM:
- dev->dlm = ioport__read8(data);
+ dev->dlm = ioport__read8(data);
break;
case UART_FCR:
- dev->fcr = ioport__read8(data);
+ dev->fcr = ioport__read8(data);
break;
case UART_LCR:
- dev->lcr = ioport__read8(data);
+ dev->lcr = ioport__read8(data);
break;
case UART_MCR:
- dev->mcr = ioport__read8(data);
+ dev->mcr = ioport__read8(data);
break;
case UART_LSR:
/* Factory test */
@@ -211,11 +211,11 @@ static bool serial8250_out(struct ioport *ioport, struct kvm *kvm, u16 port, voi
/* Not used */
break;
case UART_SCR:
- dev->scr = ioport__read8(data);
+ dev->scr = ioport__read8(data);
break;
default:
- ret = false;
- goto out_unlock;
+ ret = false;
+ break;
}
} else {
switch (offset) {
@@ -225,21 +225,21 @@ static bool serial8250_out(struct ioport *ioport, struct kvm *kvm, u16 port, voi
if (!(dev->mcr & UART_MCR_LOOP))
term_putc(CONSOLE_8250, addr, size, dev->id);
- dev->iir = UART_IIR_NO_INT;
+ dev->iir = UART_IIR_NO_INT;
break;
}
case UART_FCR:
- dev->fcr = ioport__read8(data);
+ dev->fcr = ioport__read8(data);
break;
case UART_IER:
- dev->ier = ioport__read8(data) & 0x3f;
+ dev->ier = ioport__read8(data) & 0x3f;
kvm__irq_line(kvm, dev->irq, dev->ier ? 1 : 0);
break;
case UART_LCR:
- dev->lcr = ioport__read8(data);
+ dev->lcr = ioport__read8(data);
break;
case UART_MCR:
- dev->mcr = ioport__read8(data);
+ dev->mcr = ioport__read8(data);
break;
case UART_LSR:
/* Factory test */
@@ -248,15 +248,14 @@ static bool serial8250_out(struct ioport *ioport, struct kvm *kvm, u16 port, voi
/* Not used */
break;
case UART_SCR:
- dev->scr = ioport__read8(data);
+ dev->scr = ioport__read8(data);
break;
default:
- ret = false;
- goto out_unlock;
+ ret = false;
+ break;
}
}
-out_unlock:
mutex_unlock(&dev->mutex);
return ret;
@@ -268,13 +267,13 @@ static bool serial8250_in(struct ioport *ioport, struct kvm *kvm, u16 port, void
u16 offset;
bool ret = true;
- dev = find_device(port);
+ dev = find_device(port);
if (!dev)
return false;
mutex_lock(&dev->mutex);
- offset = port - dev->iobase;
+ offset = port - dev->iobase;
if (dev->lcr & UART_LCR_DLAB) {
switch (offset) {
@@ -293,8 +292,8 @@ static bool serial8250_in(struct ioport *ioport, struct kvm *kvm, u16 port, void
switch (offset) {
case UART_RX:
ioport__write8(data, dev->rbr);
- dev->lsr &= ~UART_LSR_DR;
- dev->iir = UART_IIR_NO_INT;
+ dev->lsr &= ~UART_LSR_DR;
+ dev->iir = UART_IIR_NO_INT;
goto out_unlock;
case UART_IER:
@@ -311,7 +310,7 @@ static bool serial8250_in(struct ioport *ioport, struct kvm *kvm, u16 port, void
u8 iir = dev->iir;
if (dev->fcr & UART_FCR_ENABLE_FIFO)
- iir |= 0xc0;
+ iir |= 0xc0;
ioport__write8(data, iir);
break;
@@ -324,7 +323,7 @@ static bool serial8250_in(struct ioport *ioport, struct kvm *kvm, u16 port, void
break;
case UART_LSR:
ioport__write8(data, dev->lsr);
- dev->lsr &= ~(UART_LSR_OE|UART_LSR_PE|UART_LSR_FE|UART_LSR_BI);
+ dev->lsr &= ~(UART_LSR_OE|UART_LSR_PE|UART_LSR_FE|UART_LSR_BI);
break;
case UART_MSR:
ioport__write8(data, dev->msr);
@@ -333,7 +332,7 @@ static bool serial8250_in(struct ioport *ioport, struct kvm *kvm, u16 port, void
ioport__write8(data, dev->scr);
break;
default:
- ret = false;
+ ret = false;
goto out_unlock;
}
out_unlock:
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|