* [PATCH v2] omap: serial: fix coding style indentaion
@ 2010-01-07 19:38 Vikram Pandita
2010-01-07 19:51 ` Kevin Hilman
2010-01-11 23:36 ` [APPLIED] " Tony Lindgren
0 siblings, 2 replies; 3+ messages in thread
From: Vikram Pandita @ 2010-01-07 19:38 UTC (permalink / raw)
To: linux-omap; +Cc: Vikram Pandita, Menon, Nishanth
No logical code change
Fix coding style indentaion as per checkpatch.pl
Fix multi-line comment style reported by Nishanth Menon
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Menon, Nishanth <nm@ti.com>
---
arch/arm/mach-omap2/serial.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 8c964be..837b347 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -694,15 +694,16 @@ void __init omap_serial_init_port(int port)
DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout);
}
- /* omap44xx: Never read empty UART fifo
- * omap3xxx: Never read empty UART fifo on UARTs
- * with IP rev >=0x52
- */
- if (cpu_is_omap44xx())
- uart->p->serial_in = serial_in_override;
- else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)
- >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
- uart->p->serial_in = serial_in_override;
+ /*
+ * omap44xx: Never read empty UART fifo
+ * omap3xxx: Never read empty UART fifo on UARTs
+ * with IP rev >=0x52
+ */
+ if (cpu_is_omap44xx())
+ uart->p->serial_in = serial_in_override;
+ else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)
+ >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
+ uart->p->serial_in = serial_in_override;
}
/**
--
1.6.6.rc0.66.ge160d
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] omap: serial: fix coding style indentaion
2010-01-07 19:38 [PATCH v2] omap: serial: fix coding style indentaion Vikram Pandita
@ 2010-01-07 19:51 ` Kevin Hilman
2010-01-11 23:36 ` [APPLIED] " Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Hilman @ 2010-01-07 19:51 UTC (permalink / raw)
To: Vikram Pandita; +Cc: linux-omap, Menon, Nishanth
Vikram Pandita <vikram.pandita@ti.com> writes:
> No logical code change
>
> Fix coding style indentaion as per checkpatch.pl
> Fix multi-line comment style reported by Nishanth Menon
>
> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> Cc: Menon, Nishanth <nm@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
> ---
> arch/arm/mach-omap2/serial.c | 19 ++++++++++---------
> 1 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 8c964be..837b347 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -694,15 +694,16 @@ void __init omap_serial_init_port(int port)
> DEV_CREATE_FILE(dev, &dev_attr_sleep_timeout);
> }
>
> - /* omap44xx: Never read empty UART fifo
> - * omap3xxx: Never read empty UART fifo on UARTs
> - * with IP rev >=0x52
> - */
> - if (cpu_is_omap44xx())
> - uart->p->serial_in = serial_in_override;
> - else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)
> - >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
> - uart->p->serial_in = serial_in_override;
> + /*
> + * omap44xx: Never read empty UART fifo
> + * omap3xxx: Never read empty UART fifo on UARTs
> + * with IP rev >=0x52
> + */
> + if (cpu_is_omap44xx())
> + uart->p->serial_in = serial_in_override;
> + else if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)
> + >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
> + uart->p->serial_in = serial_in_override;
> }
>
> /**
> --
> 1.6.6.rc0.66.ge160d
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* [APPLIED] [PATCH v2] omap: serial: fix coding style indentaion
2010-01-07 19:38 [PATCH v2] omap: serial: fix coding style indentaion Vikram Pandita
2010-01-07 19:51 ` Kevin Hilman
@ 2010-01-11 23:36 ` Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2010-01-11 23:36 UTC (permalink / raw)
To: linux-omap
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): cc802321b5288be27cebf9afec66d1d5e73fad2a
PatchWorks
http://patchwork.kernel.org/patch/71639/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=cc802321b5288be27cebf9afec66d1d5e73fad2a
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-11 23:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-07 19:38 [PATCH v2] omap: serial: fix coding style indentaion Vikram Pandita
2010-01-07 19:51 ` Kevin Hilman
2010-01-11 23:36 ` [APPLIED] " Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox