diff for duplicates of <20100211034502.GB21755@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 8ee9603..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,45 +1 @@ ->From 8f4ec0907030d94a66572017e86d82cd1b8cf7aa Mon Sep 17 00:00:00 2001 -From: vikram pandita <vikram.pandita@ti.com> -Date: Wed, 10 Feb 2010 18:22:54 -0800 -Subject: [PATCH] omap2/3/4: serial: fix coding style indentaion -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: Nishanth Menon <nm@ti.com> -Acked-by: Kevin Hilman <khilman@deeprootsystems.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> - -diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c -index 2b78400..5f3035e 100644 ---- a/arch/arm/mach-omap2/serial.c -+++ b/arch/arm/mach-omap2/serial.c -@@ -716,15 +716,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; - } - - /** diff --git a/a/content_digest b/N1/content_digest index 5d353d6..4f280c1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,55 +1,9 @@ "ref\020100211033310.1624.80025.stgit@baageli.muru.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0tony@atomide.com (Tony Lindgren)\0" "Subject\0[PATCH 14/17] omap2/3/4: serial: fix coding style indentaion\0" "Date\0Wed, 10 Feb 2010 19:45:02 -0800\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" - ">From 8f4ec0907030d94a66572017e86d82cd1b8cf7aa Mon Sep 17 00:00:00 2001\n" - "From: vikram pandita <vikram.pandita@ti.com>\n" - "Date: Wed, 10 Feb 2010 18:22:54 -0800\n" - "Subject: [PATCH] omap2/3/4: serial: fix coding style indentaion\n" - "\n" - "No logical code change\n" - "\n" - "Fix coding style indentaion as per checkpatch.pl\n" - "Fix multi-line comment style reported by Nishanth Menon\n" - "\n" - "Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>\n" - "Cc: Nishanth Menon <nm@ti.com>\n" - "Acked-by: Kevin Hilman <khilman@deeprootsystems.com>\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "\n" - "diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c\n" - "index 2b78400..5f3035e 100644\n" - "--- a/arch/arm/mach-omap2/serial.c\n" - "+++ b/arch/arm/mach-omap2/serial.c\n" - "@@ -716,15 +716,16 @@ void __init omap_serial_init_port(int port)\n" - " \t\tDEV_CREATE_FILE(dev, &dev_attr_sleep_timeout);\n" - " \t}\n" - " \n" - "-\t\t/* omap44xx: Never read empty UART fifo\n" - "-\t\t * omap3xxx: Never read empty UART fifo on UARTs\n" - "-\t\t * with IP rev >=0x52\n" - "-\t\t */\n" - "-\t\tif (cpu_is_omap44xx())\n" - "-\t\t\tuart->p->serial_in = serial_in_override;\n" - "-\t\telse if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)\n" - "-\t\t\t\t>= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)\n" - "-\t\t\tuart->p->serial_in = serial_in_override;\n" - "+\t/*\n" - "+\t * omap44xx: Never read empty UART fifo\n" - "+\t * omap3xxx: Never read empty UART fifo on UARTs\n" - "+\t * with IP rev >=0x52\n" - "+\t */\n" - "+\tif (cpu_is_omap44xx())\n" - "+\t\tuart->p->serial_in = serial_in_override;\n" - "+\telse if ((serial_read_reg(uart->p, UART_OMAP_MVER) & 0xFF)\n" - "+\t\t\t>= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)\n" - "+\t\tuart->p->serial_in = serial_in_override;\n" - " }\n" - " \n" - /** -10a1f7a154cb1729da9127b367e0dcb195364aa978c986075bc65cfd85015904 +eab864ef40ede38ca6088fd2fa33e45b1706cb1a5d6adc95cc5f60d20f5957dd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.