diff for duplicates of <20120502124651.30480.88827.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index 0a1e777..1665b87 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,7 +36,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +/* Au1x00 haven't got a standard divisor latch */ +static int _serial_dl_read(struct uart_8250_port *up) +{ -+ if (up->port.iotype = UPIO_AU) ++ if (up->port.iotype == UPIO_AU) + return __raw_readl(up->port.membase + 0x28); + else + return default_dl_read(up); @@ -44,7 +44,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + +static void _serial_dl_write(struct uart_8250_port *up, int value) +{ -+ if (up->port.iotype = UPIO_AU) ++ if (up->port.iotype == UPIO_AU) + __raw_writel(value, up->port.membase + 0x28); + else + default_dl_write(up, value); @@ -52,7 +52,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> +#elif defined(CONFIG_SERIAL_8250_RM9K) +static int _serial_dl_read(struct uart_8250_port *up) +{ -+ return (up->port.iotype = UPIO_RM9000) ? ++ return (up->port.iotype == UPIO_RM9000) ? + (((__raw_readl(up->port.membase + 0x10) << 8) | + (__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff) : + default_dl_read(up); @@ -60,7 +60,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> + +static void _serial_dl_write(struct uart_8250_port *up, int value) +{ -+ if (up->port.iotype = UPIO_RM9000) { ++ if (up->port.iotype == UPIO_RM9000) { + __raw_writel(value, up->port.membase + 0x08); + __raw_writel(value >> 8, up->port.membase + 0x10); + } else { @@ -84,7 +84,8 @@ Signed-off-by: Magnus Damm <damm@opensource.se> /* Au1x00 UART hardware has a weird register layout */ @@ -434,6 +494,10 @@ static void set_io_from_upio(struct uart { - struct uart_8250_port *up container_of(p, struct uart_8250_port, port); + struct uart_8250_port *up = + container_of(p, struct uart_8250_port, port); + + up->dl_read = _serial_dl_read; + up->dl_write = _serial_dl_write; @@ -113,7 +114,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> -/* Au1x00 haven't got a standard divisor latch */ -static int serial_dl_read(struct uart_8250_port *up) -{ -- if (up->port.iotype = UPIO_AU) +- if (up->port.iotype == UPIO_AU) - return __raw_readl(up->port.membase + 0x28); - else - return _serial_dl_read(up); @@ -121,7 +122,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - -static void serial_dl_write(struct uart_8250_port *up, int value) -{ -- if (up->port.iotype = UPIO_AU) +- if (up->port.iotype == UPIO_AU) - __raw_writel(value, up->port.membase + 0x28); - else - _serial_dl_write(up, value); @@ -129,7 +130,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> -#elif defined(CONFIG_SERIAL_8250_RM9K) -static int serial_dl_read(struct uart_8250_port *up) -{ -- return (up->port.iotype = UPIO_RM9000) ? +- return (up->port.iotype == UPIO_RM9000) ? - (((__raw_readl(up->port.membase + 0x10) << 8) | - (__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff) : - _serial_dl_read(up); @@ -137,7 +138,7 @@ Signed-off-by: Magnus Damm <damm@opensource.se> - -static void serial_dl_write(struct uart_8250_port *up, int value) -{ -- if (up->port.iotype = UPIO_RM9000) { +- if (up->port.iotype == UPIO_RM9000) { - __raw_writel(value, up->port.membase + 0x08); - __raw_writel(value >> 8, up->port.membase + 0x10); - } else { diff --git a/a/content_digest b/N1/content_digest index e264465..898d725 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120502124642.30480.41373.sendpatchset@w520\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 01/06] serial8250: Add dl_read()/dl_write() callbacks\0" - "Date\0Wed, 02 May 2012 12:46:51 +0000\0" + "Date\0Wed, 02 May 2012 21:46:51 +0900\0" "To\0linux-serial@vger.kernel.org\0" "Cc\0arnd@arndb.de" swarren@wwwdotorg.org @@ -56,7 +56,7 @@ "+/* Au1x00 haven't got a standard divisor latch */\n" "+static int _serial_dl_read(struct uart_8250_port *up)\n" "+{\n" - "+\tif (up->port.iotype = UPIO_AU)\n" + "+\tif (up->port.iotype == UPIO_AU)\n" "+\t\treturn __raw_readl(up->port.membase + 0x28);\n" "+\telse\n" "+\t\treturn default_dl_read(up);\n" @@ -64,7 +64,7 @@ "+\n" "+static void _serial_dl_write(struct uart_8250_port *up, int value)\n" "+{\n" - "+\tif (up->port.iotype = UPIO_AU)\n" + "+\tif (up->port.iotype == UPIO_AU)\n" "+\t\t__raw_writel(value, up->port.membase + 0x28);\n" "+\telse\n" "+\t\tdefault_dl_write(up, value);\n" @@ -72,7 +72,7 @@ "+#elif defined(CONFIG_SERIAL_8250_RM9K)\n" "+static int _serial_dl_read(struct uart_8250_port *up)\n" "+{\n" - "+\treturn\t(up->port.iotype = UPIO_RM9000) ?\n" + "+\treturn\t(up->port.iotype == UPIO_RM9000) ?\n" "+\t\t(((__raw_readl(up->port.membase + 0x10) << 8) |\n" "+\t\t(__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff) :\n" "+\t\tdefault_dl_read(up);\n" @@ -80,7 +80,7 @@ "+\n" "+static void _serial_dl_write(struct uart_8250_port *up, int value)\n" "+{\n" - "+\tif (up->port.iotype = UPIO_RM9000) {\n" + "+\tif (up->port.iotype == UPIO_RM9000) {\n" "+\t\t__raw_writel(value, up->port.membase + 0x08);\n" "+\t\t__raw_writel(value >> 8, up->port.membase + 0x10);\n" "+\t} else {\n" @@ -104,7 +104,8 @@ " /* Au1x00 UART hardware has a weird register layout */\n" "@@ -434,6 +494,10 @@ static void set_io_from_upio(struct uart\n" " {\n" - " \tstruct uart_8250_port *up \t\tcontainer_of(p, struct uart_8250_port, port);\n" + " \tstruct uart_8250_port *up =\n" + " \t\tcontainer_of(p, struct uart_8250_port, port);\n" "+\n" "+\tup->dl_read = _serial_dl_read;\n" "+\tup->dl_write = _serial_dl_write;\n" @@ -133,7 +134,7 @@ "-/* Au1x00 haven't got a standard divisor latch */\n" "-static int serial_dl_read(struct uart_8250_port *up)\n" "-{\n" - "-\tif (up->port.iotype = UPIO_AU)\n" + "-\tif (up->port.iotype == UPIO_AU)\n" "-\t\treturn __raw_readl(up->port.membase + 0x28);\n" "-\telse\n" "-\t\treturn _serial_dl_read(up);\n" @@ -141,7 +142,7 @@ "-\n" "-static void serial_dl_write(struct uart_8250_port *up, int value)\n" "-{\n" - "-\tif (up->port.iotype = UPIO_AU)\n" + "-\tif (up->port.iotype == UPIO_AU)\n" "-\t\t__raw_writel(value, up->port.membase + 0x28);\n" "-\telse\n" "-\t\t_serial_dl_write(up, value);\n" @@ -149,7 +150,7 @@ "-#elif defined(CONFIG_SERIAL_8250_RM9K)\n" "-static int serial_dl_read(struct uart_8250_port *up)\n" "-{\n" - "-\treturn\t(up->port.iotype = UPIO_RM9000) ?\n" + "-\treturn\t(up->port.iotype == UPIO_RM9000) ?\n" "-\t\t(((__raw_readl(up->port.membase + 0x10) << 8) |\n" "-\t\t(__raw_readl(up->port.membase + 0x08) & 0xff)) & 0xffff) :\n" "-\t\t_serial_dl_read(up);\n" @@ -157,7 +158,7 @@ "-\n" "-static void serial_dl_write(struct uart_8250_port *up, int value)\n" "-{\n" - "-\tif (up->port.iotype = UPIO_RM9000) {\n" + "-\tif (up->port.iotype == UPIO_RM9000) {\n" "-\t\t__raw_writel(value, up->port.membase + 0x08);\n" "-\t\t__raw_writel(value >> 8, up->port.membase + 0x10);\n" "-\t} else {\n" @@ -203,4 +204,4 @@ " /*\n" * Digital did something really horribly wrong with the OUT1 and OUT2 -b4a17cc4142ceaf03b308ff0c98507e80c030659e618ed8190b7e75d22e8d786 +d0739f0630f69173dd37a13605f1a8a3fde24d7fca1adbe7a3a4629e506889ea
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.