diff for duplicates of <5671961F.2080304@hurleysoftware.com> diff --git a/a/1.txt b/N1/1.txt index 7a7e003..8dcb125 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,15 +1,12 @@ Hi Anton, On 12/16/2015 07:36 AM, Anton Wuerfel wrote: -> Checkpatch complains about incorrect indentation of switch/case state= -ments. -> This patch fixes the corresponding warnings. Additionally some indent= -ation +> Checkpatch complains about incorrect indentation of switch/case statements. +> This patch fixes the corresponding warnings. Additionally some indentation > is changed to match the correct format specified in the Linux Kernel > Coding Style. -This patch needs split; separate the "leading spaces instead of tabs" f= -rom +This patch needs split; separate the "leading spaces instead of tabs" from the "GNU-style indent level". Personally, I don't think it's worth changing existing code to meet the @@ -20,70 +17,66 @@ Regards, Peter Hurley -> Signed-off-by: Anton W=C3=BCrfel <anton.wuerfel@fau.de> +> Signed-off-by: Anton Würfel <anton.wuerfel@fau.de> > Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de> > CC: linux-kernel@i4.cs.fau.de > --- -> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++------------= ----- +> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++---------------- > drivers/tty/serial/8250/8250_pnp.c | 4 ++-- > drivers/tty/serial/8250/8250_port.c | 14 +++++++------- > 3 files changed, 24 insertions(+), 25 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/= -8250/8250_pci.c +> +> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c > index ed99fdf..41508a5 100644 > --- a/drivers/tty/serial/8250/8250_pci.c > +++ b/drivers/tty/serial/8250/8250_pci.c > @@ -722,7 +722,7 @@ static int pci_ni8430_init(struct pci_dev *dev) > */ > pcibios_resource_to_bus(dev->bus, ®ion, &dev->resource[bar]); -> device_window =3D ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xfff= -fff00) +> device_window = ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00) > - | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE; > + | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE; > writel(device_window, p + MITE_IOWBSR1); -> =20 +> > /* Set window access to go to RAMSEL IO address space */ > @@ -843,17 +843,16 @@ static int pci_netmos_init(struct pci_dev *dev) > return 0; -> =20 +> > switch (dev->device) { /* FALLTHROUGH on all */ > - case PCI_DEVICE_ID_NETMOS_9904: > - case PCI_DEVICE_ID_NETMOS_9912: > - case PCI_DEVICE_ID_NETMOS_9922: > - case PCI_DEVICE_ID_NETMOS_9900: -> - num_serial =3D pci_netmos_9900_numports(dev); +> - num_serial = pci_netmos_9900_numports(dev); > - break; > + case PCI_DEVICE_ID_NETMOS_9904: > + case PCI_DEVICE_ID_NETMOS_9912: > + case PCI_DEVICE_ID_NETMOS_9922: > + case PCI_DEVICE_ID_NETMOS_9900: -> + num_serial =3D pci_netmos_9900_numports(dev); +> + num_serial = pci_netmos_9900_numports(dev); > + break; -> =20 +> > - default: -> - if (num_serial =3D=3D 0 ) { +> - if (num_serial == 0 ) { > - moan_device("unknown NetMos/Mostech device", dev); > - } > + default: -> + if (num_serial =3D=3D 0) +> + if (num_serial == 0) > + moan_device("unknown NetMos/Mostech device", dev); > } -> =20 -> if (num_serial =3D=3D 0) +> +> if (num_serial == 0) > @@ -1766,7 +1765,7 @@ xr17v35x_has_slave(struct serial_private *priv) -> const int dev_id =3D priv->dev->device; -> =20 -> return ((dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V4358) || -> - (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358)); -> + (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358)); +> const int dev_id = priv->dev->device; +> +> return ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) || +> - (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358)); +> + (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358)); > } -> =20 +> > static int -> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *pri= -v, -> =20 +> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *priv, +> > static int > pci_wch_ch353_setup(struct serial_private *priv, > - const struct pciserial_board *board, @@ -91,11 +84,10 @@ v, > + const struct pciserial_board *board, > + struct uart_8250_port *port, int idx) > { -> port->port.flags |=3D UPF_FIXED_TYPE; -> port->port.type =3D PORT_16550A; -> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv= -, -> =20 +> port->port.flags |= UPF_FIXED_TYPE; +> port->port.type = PORT_16550A; +> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv, +> > static int > pci_wch_ch38x_setup(struct serial_private *priv, > - const struct pciserial_board *board, @@ -103,10 +95,9 @@ v, > + const struct pciserial_board *board, > + struct uart_8250_port *port, int idx) > { -> port->port.flags |=3D UPF_FIXED_TYPE; -> port->port.type =3D PORT_16850; -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> port->port.flags |= UPF_FIXED_TYPE; +> port->port.type = PORT_16850; +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 658b392..1f18065 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c @@ -118,58 +109,51 @@ v, > - return -ENODEV; > + (dev->card && check_name(dev->card->name)))) > + return -ENODEV; -> =20 +> > if (check_resources(dev)) > return 0; -> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial= -/8250/8250_port.c +> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c > index ae8f993..57ad0f2 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c > @@ -52,7 +52,7 @@ > #define DEBUG_AUTOCONF(fmt...) do { } while (0) > #endif -> =20 +> > -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) > +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -> =20 +> > /* -> * Here we define the default xmit fifo size used for each type of U= -ART. -> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_= -port *port, unsigned int baud, +> * Here we define the default xmit fifo size used for each type of UART. +> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud, > serial_port_out(port, 0x2, quot_frac); > } -> =20 +> > -static unsigned int -> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *te= -rmios, +> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios, > - struct ktermios *old) > +static unsigned int serial8250_get_baud_rate(struct uart_port *port, > + struct ktermios *termios, > + struct ktermios *old) > { -> unsigned int tolerance =3D port->uartclk / 100; -> =20 -> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port= -, struct ktermios *termios, +> unsigned int tolerance = port->uartclk / 100; +> +> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios, > (port->uartclk + tolerance) / 16); > } -> =20 +> > -void -> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *t= -ermios, +> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, > - struct ktermios *old) > +void serial8250_do_set_termios(struct uart_port *port, > + struct ktermios *termios, > + struct ktermios *old) > { -> struct uart_8250_port *up =3D up_to_u8250p(port); +> struct uart_8250_port *up = up_to_u8250p(port); > unsigned char cval; ->=20 +> -- -To unsubscribe from this list: send the line "unsubscribe linux-parisc"= - in +To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 0b4d1de..105274c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,21 +26,18 @@ linux-kernel@vger.kernel.org linux-parisc@vger.kernel.org linux-kernel@i4.cs.fau.de - " Phillip Raffeck <phillip.raffe\0" + " Phillip Raffeck <phillip.raffe>\0" "\00:1\0" "b\0" "Hi Anton,\n" "\n" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" - "> Checkpatch complains about incorrect indentation of switch/case state=\n" - "ments.\n" - "> This patch fixes the corresponding warnings. Additionally some indent=\n" - "ation\n" + "> Checkpatch complains about incorrect indentation of switch/case statements.\n" + "> This patch fixes the corresponding warnings. Additionally some indentation\n" "> is changed to match the correct format specified in the Linux Kernel\n" "> Coding Style.\n" "\n" - "This patch needs split; separate the \"leading spaces instead of tabs\" f=\n" - "rom\n" + "This patch needs split; separate the \"leading spaces instead of tabs\" from\n" "the \"GNU-style indent level\".\n" "\n" "Personally, I don't think it's worth changing existing code to meet the\n" @@ -51,70 +48,66 @@ "Peter Hurley\n" "\n" "\n" - "> Signed-off-by: Anton W=C3=BCrfel <anton.wuerfel@fau.de>\n" + "> Signed-off-by: Anton W\303\274rfel <anton.wuerfel@fau.de>\n" "> Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>\n" "> CC: linux-kernel@i4.cs.fau.de\n" "> ---\n" - "> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++------------=\n" - "----\n" + "> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++----------------\n" "> drivers/tty/serial/8250/8250_pnp.c | 4 ++--\n" "> drivers/tty/serial/8250/8250_port.c | 14 +++++++-------\n" "> 3 files changed, 24 insertions(+), 25 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n" - "8250/8250_pci.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n" "> index ed99fdf..41508a5 100644\n" "> --- a/drivers/tty/serial/8250/8250_pci.c\n" "> +++ b/drivers/tty/serial/8250/8250_pci.c\n" "> @@ -722,7 +722,7 @@ static int pci_ni8430_init(struct pci_dev *dev)\n" "> \t */\n" "> \tpcibios_resource_to_bus(dev->bus, ®ion, &dev->resource[bar]);\n" - "> \tdevice_window =3D ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xfff=\n" - "fff00)\n" + "> \tdevice_window = ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00)\n" "> -\t | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;\n" "> +\t\t\t| MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;\n" "> \twritel(device_window, p + MITE_IOWBSR1);\n" - "> =20\n" + "> \n" "> \t/* Set window access to go to RAMSEL IO address space */\n" "> @@ -843,17 +843,16 @@ static int pci_netmos_init(struct pci_dev *dev)\n" "> \t\treturn 0;\n" - "> =20\n" + "> \n" "> \tswitch (dev->device) { /* FALLTHROUGH on all */\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9904:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9912:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9922:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9900:\n" - "> -\t\t\tnum_serial =3D pci_netmos_9900_numports(dev);\n" + "> -\t\t\tnum_serial = pci_netmos_9900_numports(dev);\n" "> -\t\t\tbreak;\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9904:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9912:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9922:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9900:\n" - "> +\t\tnum_serial =3D pci_netmos_9900_numports(dev);\n" + "> +\t\tnum_serial = pci_netmos_9900_numports(dev);\n" "> +\t\tbreak;\n" - "> =20\n" + "> \n" "> -\t\tdefault:\n" - "> -\t\t\tif (num_serial =3D=3D 0 ) {\n" + "> -\t\t\tif (num_serial == 0 ) {\n" "> -\t\t\t\tmoan_device(\"unknown NetMos/Mostech device\", dev);\n" "> -\t\t\t}\n" "> +\tdefault:\n" - "> +\t\tif (num_serial =3D=3D 0)\n" + "> +\t\tif (num_serial == 0)\n" "> +\t\t\tmoan_device(\"unknown NetMos/Mostech device\", dev);\n" "> \t}\n" - "> =20\n" - "> \tif (num_serial =3D=3D 0)\n" + "> \n" + "> \tif (num_serial == 0)\n" "> @@ -1766,7 +1765,7 @@ xr17v35x_has_slave(struct serial_private *priv)\n" - "> \tconst int dev_id =3D priv->dev->device;\n" - "> =20\n" - "> \treturn ((dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V4358) ||\n" - "> -\t (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358));\n" - "> +\t\t(dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358));\n" + "> \tconst int dev_id = priv->dev->device;\n" + "> \n" + "> \treturn ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) ||\n" + "> -\t (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));\n" + "> +\t\t(dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));\n" "> }\n" - "> =20\n" + "> \n" "> static int\n" - "> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *pri=\n" - "v,\n" - "> =20\n" + "> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *priv,\n" + "> \n" "> static int\n" "> pci_wch_ch353_setup(struct serial_private *priv,\n" "> - const struct pciserial_board *board,\n" @@ -122,11 +115,10 @@ "> +\t\t const struct pciserial_board *board,\n" "> +\t\t struct uart_8250_port *port, int idx)\n" "> {\n" - "> \tport->port.flags |=3D UPF_FIXED_TYPE;\n" - "> \tport->port.type =3D PORT_16550A;\n" - "> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv=\n" - ",\n" - "> =20\n" + "> \tport->port.flags |= UPF_FIXED_TYPE;\n" + "> \tport->port.type = PORT_16550A;\n" + "> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv,\n" + "> \n" "> static int\n" "> pci_wch_ch38x_setup(struct serial_private *priv,\n" "> - const struct pciserial_board *board,\n" @@ -134,10 +126,9 @@ "> +\t\t const struct pciserial_board *board,\n" "> +\t\t struct uart_8250_port *port, int idx)\n" "> {\n" - "> \tport->port.flags |=3D UPF_FIXED_TYPE;\n" - "> \tport->port.type =3D PORT_16850;\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> \tport->port.flags |= UPF_FIXED_TYPE;\n" + "> \tport->port.type = PORT_16850;\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 658b392..1f18065 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" @@ -149,60 +140,53 @@ "> -\t\t\treturn -ENODEV;\n" "> +\t (dev->card && check_name(dev->card->name))))\n" "> +\t\treturn -ENODEV;\n" - "> =20\n" + "> \n" "> \tif (check_resources(dev))\n" "> \t\treturn 0;\n" - "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial=\n" - "/8250/8250_port.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c\n" "> index ae8f993..57ad0f2 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" "> @@ -52,7 +52,7 @@\n" "> #define DEBUG_AUTOCONF(fmt...)\tdo { } while (0)\n" "> #endif\n" - "> =20\n" + "> \n" "> -#define BOTH_EMPTY \t(UART_LSR_TEMT | UART_LSR_THRE)\n" "> +#define BOTH_EMPTY\t(UART_LSR_TEMT | UART_LSR_THRE)\n" - "> =20\n" + "> \n" "> /*\n" - "> * Here we define the default xmit fifo size used for each type of U=\n" - "ART.\n" - "> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_=\n" - "port *port, unsigned int baud,\n" + "> * Here we define the default xmit fifo size used for each type of UART.\n" + "> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud,\n" "> \t\tserial_port_out(port, 0x2, quot_frac);\n" "> }\n" - "> =20\n" + "> \n" "> -static unsigned int\n" - "> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *te=\n" - "rmios,\n" + "> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios,\n" "> -\t\t\t struct ktermios *old)\n" "> +static unsigned int serial8250_get_baud_rate(struct uart_port *port,\n" "> +\t\t\t\t\t struct ktermios *termios,\n" "> +\t\t\t\t\t struct ktermios *old)\n" "> {\n" - "> \tunsigned int tolerance =3D port->uartclk / 100;\n" - "> =20\n" - "> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port=\n" - ", struct ktermios *termios,\n" + "> \tunsigned int tolerance = port->uartclk / 100;\n" + "> \n" + "> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios,\n" "> \t\t\t\t (port->uartclk + tolerance) / 16);\n" "> }\n" - "> =20\n" + "> \n" "> -void\n" - "> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *t=\n" - "ermios,\n" + "> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,\n" "> -\t\t struct ktermios *old)\n" "> +void serial8250_do_set_termios(struct uart_port *port,\n" "> +\t\t\t struct ktermios *termios,\n" "> +\t\t\t struct ktermios *old)\n" "> {\n" - "> \tstruct uart_8250_port *up =3D up_to_u8250p(port);\n" + "> \tstruct uart_8250_port *up = up_to_u8250p(port);\n" "> \tunsigned char cval;\n" - ">=20\n" + "> \n" "\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\"=\n" - " in\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\" in\n" "the body of a message to majordomo@vger.kernel.org\n" More majordomo info at http://vger.kernel.org/majordomo-info.html -d7dac7842f21dc2b44811003248107562818adea4eb58c887820bdec4208ee9a +985b17c922164cf97449bc6a7ac9bda304224c9dcacfd00cce9b8ca97f32290f
diff --git a/a/1.txt b/N2/1.txt index 7a7e003..0498d36 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,15 +1,12 @@ Hi Anton, On 12/16/2015 07:36 AM, Anton Wuerfel wrote: -> Checkpatch complains about incorrect indentation of switch/case state= -ments. -> This patch fixes the corresponding warnings. Additionally some indent= -ation +> Checkpatch complains about incorrect indentation of switch/case statements. +> This patch fixes the corresponding warnings. Additionally some indentation > is changed to match the correct format specified in the Linux Kernel > Coding Style. -This patch needs split; separate the "leading spaces instead of tabs" f= -rom +This patch needs split; separate the "leading spaces instead of tabs" from the "GNU-style indent level". Personally, I don't think it's worth changing existing code to meet the @@ -20,70 +17,66 @@ Regards, Peter Hurley -> Signed-off-by: Anton W=C3=BCrfel <anton.wuerfel@fau.de> +> Signed-off-by: Anton Würfel <anton.wuerfel@fau.de> > Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de> > CC: linux-kernel@i4.cs.fau.de > --- -> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++------------= ----- +> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++---------------- > drivers/tty/serial/8250/8250_pnp.c | 4 ++-- > drivers/tty/serial/8250/8250_port.c | 14 +++++++------- > 3 files changed, 24 insertions(+), 25 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/= -8250/8250_pci.c +> +> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c > index ed99fdf..41508a5 100644 > --- a/drivers/tty/serial/8250/8250_pci.c > +++ b/drivers/tty/serial/8250/8250_pci.c > @@ -722,7 +722,7 @@ static int pci_ni8430_init(struct pci_dev *dev) > */ > pcibios_resource_to_bus(dev->bus, ®ion, &dev->resource[bar]); -> device_window =3D ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xfff= -fff00) +> device_window = ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00) > - | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE; > + | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE; > writel(device_window, p + MITE_IOWBSR1); -> =20 +> > /* Set window access to go to RAMSEL IO address space */ > @@ -843,17 +843,16 @@ static int pci_netmos_init(struct pci_dev *dev) > return 0; -> =20 +> > switch (dev->device) { /* FALLTHROUGH on all */ > - case PCI_DEVICE_ID_NETMOS_9904: > - case PCI_DEVICE_ID_NETMOS_9912: > - case PCI_DEVICE_ID_NETMOS_9922: > - case PCI_DEVICE_ID_NETMOS_9900: -> - num_serial =3D pci_netmos_9900_numports(dev); +> - num_serial = pci_netmos_9900_numports(dev); > - break; > + case PCI_DEVICE_ID_NETMOS_9904: > + case PCI_DEVICE_ID_NETMOS_9912: > + case PCI_DEVICE_ID_NETMOS_9922: > + case PCI_DEVICE_ID_NETMOS_9900: -> + num_serial =3D pci_netmos_9900_numports(dev); +> + num_serial = pci_netmos_9900_numports(dev); > + break; -> =20 +> > - default: -> - if (num_serial =3D=3D 0 ) { +> - if (num_serial == 0 ) { > - moan_device("unknown NetMos/Mostech device", dev); > - } > + default: -> + if (num_serial =3D=3D 0) +> + if (num_serial == 0) > + moan_device("unknown NetMos/Mostech device", dev); > } -> =20 -> if (num_serial =3D=3D 0) +> +> if (num_serial == 0) > @@ -1766,7 +1765,7 @@ xr17v35x_has_slave(struct serial_private *priv) -> const int dev_id =3D priv->dev->device; -> =20 -> return ((dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V4358) || -> - (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358)); -> + (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358)); +> const int dev_id = priv->dev->device; +> +> return ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) || +> - (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358)); +> + (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358)); > } -> =20 +> > static int -> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *pri= -v, -> =20 +> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *priv, +> > static int > pci_wch_ch353_setup(struct serial_private *priv, > - const struct pciserial_board *board, @@ -91,11 +84,10 @@ v, > + const struct pciserial_board *board, > + struct uart_8250_port *port, int idx) > { -> port->port.flags |=3D UPF_FIXED_TYPE; -> port->port.type =3D PORT_16550A; -> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv= -, -> =20 +> port->port.flags |= UPF_FIXED_TYPE; +> port->port.type = PORT_16550A; +> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv, +> > static int > pci_wch_ch38x_setup(struct serial_private *priv, > - const struct pciserial_board *board, @@ -103,10 +95,9 @@ v, > + const struct pciserial_board *board, > + struct uart_8250_port *port, int idx) > { -> port->port.flags |=3D UPF_FIXED_TYPE; -> port->port.type =3D PORT_16850; -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> port->port.flags |= UPF_FIXED_TYPE; +> port->port.type = PORT_16850; +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 658b392..1f18065 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c @@ -118,58 +109,46 @@ v, > - return -ENODEV; > + (dev->card && check_name(dev->card->name)))) > + return -ENODEV; -> =20 +> > if (check_resources(dev)) > return 0; -> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial= -/8250/8250_port.c +> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c > index ae8f993..57ad0f2 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c > @@ -52,7 +52,7 @@ > #define DEBUG_AUTOCONF(fmt...) do { } while (0) > #endif -> =20 +> > -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) > +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -> =20 +> > /* -> * Here we define the default xmit fifo size used for each type of U= -ART. -> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_= -port *port, unsigned int baud, +> * Here we define the default xmit fifo size used for each type of UART. +> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud, > serial_port_out(port, 0x2, quot_frac); > } -> =20 +> > -static unsigned int -> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *te= -rmios, +> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios, > - struct ktermios *old) > +static unsigned int serial8250_get_baud_rate(struct uart_port *port, > + struct ktermios *termios, > + struct ktermios *old) > { -> unsigned int tolerance =3D port->uartclk / 100; -> =20 -> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port= -, struct ktermios *termios, +> unsigned int tolerance = port->uartclk / 100; +> +> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios, > (port->uartclk + tolerance) / 16); > } -> =20 +> > -void -> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *t= -ermios, +> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, > - struct ktermios *old) > +void serial8250_do_set_termios(struct uart_port *port, > + struct ktermios *termios, > + struct ktermios *old) > { -> struct uart_8250_port *up =3D up_to_u8250p(port); +> struct uart_8250_port *up = up_to_u8250p(port); > unsigned char cval; ->=20 - --- -To unsubscribe from this list: send the line "unsubscribe linux-parisc"= - in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +> diff --git a/a/content_digest b/N2/content_digest index 0b4d1de..11f02ce 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -26,21 +26,18 @@ linux-kernel@vger.kernel.org linux-parisc@vger.kernel.org linux-kernel@i4.cs.fau.de - " Phillip Raffeck <phillip.raffe\0" + " Phillip Raffeck <phillip.raffeck@fau.de>\0" "\00:1\0" "b\0" "Hi Anton,\n" "\n" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" - "> Checkpatch complains about incorrect indentation of switch/case state=\n" - "ments.\n" - "> This patch fixes the corresponding warnings. Additionally some indent=\n" - "ation\n" + "> Checkpatch complains about incorrect indentation of switch/case statements.\n" + "> This patch fixes the corresponding warnings. Additionally some indentation\n" "> is changed to match the correct format specified in the Linux Kernel\n" "> Coding Style.\n" "\n" - "This patch needs split; separate the \"leading spaces instead of tabs\" f=\n" - "rom\n" + "This patch needs split; separate the \"leading spaces instead of tabs\" from\n" "the \"GNU-style indent level\".\n" "\n" "Personally, I don't think it's worth changing existing code to meet the\n" @@ -51,70 +48,66 @@ "Peter Hurley\n" "\n" "\n" - "> Signed-off-by: Anton W=C3=BCrfel <anton.wuerfel@fau.de>\n" + "> Signed-off-by: Anton W\303\274rfel <anton.wuerfel@fau.de>\n" "> Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>\n" "> CC: linux-kernel@i4.cs.fau.de\n" "> ---\n" - "> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++------------=\n" - "----\n" + "> drivers/tty/serial/8250/8250_pci.c | 31 +++++++++++++++----------------\n" "> drivers/tty/serial/8250/8250_pnp.c | 4 ++--\n" "> drivers/tty/serial/8250/8250_port.c | 14 +++++++-------\n" "> 3 files changed, 24 insertions(+), 25 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n" - "8250/8250_pci.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n" "> index ed99fdf..41508a5 100644\n" "> --- a/drivers/tty/serial/8250/8250_pci.c\n" "> +++ b/drivers/tty/serial/8250/8250_pci.c\n" "> @@ -722,7 +722,7 @@ static int pci_ni8430_init(struct pci_dev *dev)\n" "> \t */\n" "> \tpcibios_resource_to_bus(dev->bus, ®ion, &dev->resource[bar]);\n" - "> \tdevice_window =3D ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xfff=\n" - "fff00)\n" + "> \tdevice_window = ((region.start + MITE_IOWBSR1_WIN_OFFSET) & 0xffffff00)\n" "> -\t | MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;\n" "> +\t\t\t| MITE_IOWBSR1_WENAB | MITE_IOWBSR1_WSIZE;\n" "> \twritel(device_window, p + MITE_IOWBSR1);\n" - "> =20\n" + "> \n" "> \t/* Set window access to go to RAMSEL IO address space */\n" "> @@ -843,17 +843,16 @@ static int pci_netmos_init(struct pci_dev *dev)\n" "> \t\treturn 0;\n" - "> =20\n" + "> \n" "> \tswitch (dev->device) { /* FALLTHROUGH on all */\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9904:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9912:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9922:\n" "> -\t\tcase PCI_DEVICE_ID_NETMOS_9900:\n" - "> -\t\t\tnum_serial =3D pci_netmos_9900_numports(dev);\n" + "> -\t\t\tnum_serial = pci_netmos_9900_numports(dev);\n" "> -\t\t\tbreak;\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9904:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9912:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9922:\n" "> +\tcase PCI_DEVICE_ID_NETMOS_9900:\n" - "> +\t\tnum_serial =3D pci_netmos_9900_numports(dev);\n" + "> +\t\tnum_serial = pci_netmos_9900_numports(dev);\n" "> +\t\tbreak;\n" - "> =20\n" + "> \n" "> -\t\tdefault:\n" - "> -\t\t\tif (num_serial =3D=3D 0 ) {\n" + "> -\t\t\tif (num_serial == 0 ) {\n" "> -\t\t\t\tmoan_device(\"unknown NetMos/Mostech device\", dev);\n" "> -\t\t\t}\n" "> +\tdefault:\n" - "> +\t\tif (num_serial =3D=3D 0)\n" + "> +\t\tif (num_serial == 0)\n" "> +\t\t\tmoan_device(\"unknown NetMos/Mostech device\", dev);\n" "> \t}\n" - "> =20\n" - "> \tif (num_serial =3D=3D 0)\n" + "> \n" + "> \tif (num_serial == 0)\n" "> @@ -1766,7 +1765,7 @@ xr17v35x_has_slave(struct serial_private *priv)\n" - "> \tconst int dev_id =3D priv->dev->device;\n" - "> =20\n" - "> \treturn ((dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V4358) ||\n" - "> -\t (dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358));\n" - "> +\t\t(dev_id =3D=3D PCI_DEVICE_ID_EXAR_XR17V8358));\n" + "> \tconst int dev_id = priv->dev->device;\n" + "> \n" + "> \treturn ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) ||\n" + "> -\t (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));\n" + "> +\t\t(dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));\n" "> }\n" - "> =20\n" + "> \n" "> static int\n" - "> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *pri=\n" - "v,\n" - "> =20\n" + "> @@ -1866,8 +1865,8 @@ pci_fastcom335_setup(struct serial_private *priv,\n" + "> \n" "> static int\n" "> pci_wch_ch353_setup(struct serial_private *priv,\n" "> - const struct pciserial_board *board,\n" @@ -122,11 +115,10 @@ "> +\t\t const struct pciserial_board *board,\n" "> +\t\t struct uart_8250_port *port, int idx)\n" "> {\n" - "> \tport->port.flags |=3D UPF_FIXED_TYPE;\n" - "> \tport->port.type =3D PORT_16550A;\n" - "> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv=\n" - ",\n" - "> =20\n" + "> \tport->port.flags |= UPF_FIXED_TYPE;\n" + "> \tport->port.type = PORT_16550A;\n" + "> @@ -1876,8 +1875,8 @@ pci_wch_ch353_setup(struct serial_private *priv,\n" + "> \n" "> static int\n" "> pci_wch_ch38x_setup(struct serial_private *priv,\n" "> - const struct pciserial_board *board,\n" @@ -134,10 +126,9 @@ "> +\t\t const struct pciserial_board *board,\n" "> +\t\t struct uart_8250_port *port, int idx)\n" "> {\n" - "> \tport->port.flags |=3D UPF_FIXED_TYPE;\n" - "> \tport->port.type =3D PORT_16850;\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> \tport->port.flags |= UPF_FIXED_TYPE;\n" + "> \tport->port.type = PORT_16850;\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 658b392..1f18065 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" @@ -149,60 +140,48 @@ "> -\t\t\treturn -ENODEV;\n" "> +\t (dev->card && check_name(dev->card->name))))\n" "> +\t\treturn -ENODEV;\n" - "> =20\n" + "> \n" "> \tif (check_resources(dev))\n" "> \t\treturn 0;\n" - "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial=\n" - "/8250/8250_port.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c\n" "> index ae8f993..57ad0f2 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" "> @@ -52,7 +52,7 @@\n" "> #define DEBUG_AUTOCONF(fmt...)\tdo { } while (0)\n" "> #endif\n" - "> =20\n" + "> \n" "> -#define BOTH_EMPTY \t(UART_LSR_TEMT | UART_LSR_THRE)\n" "> +#define BOTH_EMPTY\t(UART_LSR_TEMT | UART_LSR_THRE)\n" - "> =20\n" + "> \n" "> /*\n" - "> * Here we define the default xmit fifo size used for each type of U=\n" - "ART.\n" - "> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_=\n" - "port *port, unsigned int baud,\n" + "> * Here we define the default xmit fifo size used for each type of UART.\n" + "> @@ -2236,9 +2236,9 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud,\n" "> \t\tserial_port_out(port, 0x2, quot_frac);\n" "> }\n" - "> =20\n" + "> \n" "> -static unsigned int\n" - "> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *te=\n" - "rmios,\n" + "> -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios,\n" "> -\t\t\t struct ktermios *old)\n" "> +static unsigned int serial8250_get_baud_rate(struct uart_port *port,\n" "> +\t\t\t\t\t struct ktermios *termios,\n" "> +\t\t\t\t\t struct ktermios *old)\n" "> {\n" - "> \tunsigned int tolerance =3D port->uartclk / 100;\n" - "> =20\n" - "> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port=\n" - ", struct ktermios *termios,\n" + "> \tunsigned int tolerance = port->uartclk / 100;\n" + "> \n" + "> @@ -2253,9 +2253,9 @@ serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios,\n" "> \t\t\t\t (port->uartclk + tolerance) / 16);\n" "> }\n" - "> =20\n" + "> \n" "> -void\n" - "> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *t=\n" - "ermios,\n" + "> -serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,\n" "> -\t\t struct ktermios *old)\n" "> +void serial8250_do_set_termios(struct uart_port *port,\n" "> +\t\t\t struct ktermios *termios,\n" "> +\t\t\t struct ktermios *old)\n" "> {\n" - "> \tstruct uart_8250_port *up =3D up_to_u8250p(port);\n" + "> \tstruct uart_8250_port *up = up_to_u8250p(port);\n" "> \tunsigned char cval;\n" - ">=20\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\"=\n" - " in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + > -d7dac7842f21dc2b44811003248107562818adea4eb58c887820bdec4208ee9a +c1bf4cecac643810c1abbdbee32d707756ffb6199396df059a0fbb59089e5194
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.