diff for duplicates of <567196CC.2090305@hurleysoftware.com> diff --git a/a/1.txt b/N1/1.txt index 9d76f3e..313fffb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,29 +1,26 @@ On 12/16/2015 07:36 AM, Anton Wuerfel wrote: > Checkpatch outputs some warnings about incorrect comment style, > which is fixed by this patch. ->=20 +> Please fix the comments in a consistent fashion. For example ... -> 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_ingenic.c | 6 ++- > drivers/tty/serial/8250/8250_pnp.c | 6 ++- > drivers/tty/serial/8250/8250_port.c | 29 ++++++----- -> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++-----= ----------- +> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++--------------- > 4 files changed, 75 insertions(+), 58 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/ser= -ial/8250/8250_ingenic.c +> +> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c > index 49394b4..c53d2501 100644 > --- a/drivers/tty/serial/8250/8250_ingenic.c > +++ b/drivers/tty/serial/8250/8250_ingenic.c -> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart= -_port *p, int offset, int value) -> =20 +> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value) +> > case UART_IER: > /* Enable receive timeout interrupt with the > - * receive line status interrupt */ @@ -32,24 +29,22 @@ _port *p, int offset, int value) This isn't the same style as ... -> value |=3D (value & 0x4) << 2; +> value |= (value & 0x4) << 2; > break; -> =20 +> > case UART_MCR: > /* If we have enabled modem status IRQs we should enable modem > - * mode. */ > + * mode. > + */ -> ier =3D p->serial_in(p, UART_IER); -> =20 +> ier = p->serial_in(p, UART_IER); +> > if (ier & UART_IER_MSI) -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 1f18065..2731031 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c -> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[= -] =3D { +> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = { > { "PNPCXXX", UNKNOWN_DEV }, > /* More unknown PnP modems */ > { "PNPDXXX", UNKNOWN_DEV }, @@ -65,33 +60,29 @@ this style. > { "WEC1022", CIR_PORT }, > /* > * SMSC IrCC SIR/FIR port, should not be probed by serial driver -> 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 57ad0f2..0ec823e 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c -> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_confi= -g[] =3D { -> .fcr =3D UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, -> .flags =3D UART_CAP_FIFO | UART_CAP_AFE, +> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = { +> .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, +> .flags = UART_CAP_FIFO | UART_CAP_AFE, > }, > -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement > -workaround of errata A-008006 which states that tx_loadsz should be > -configured less than Maximum supported fifo bytes */ > + /* > + * tx_loadsz is set to 63-bytes instead of 64-bytes to implement -> + * workaround of errata A-008006 which states that tx_loadsz should= - be +> + * workaround of errata A-008006 which states that tx_loadsz should be > + * configured less than Maximum supported fifo bytes > + */ -> [PORT_16550A_FSL64] =3D { -> .name =3D "16550A_FSL64", -> .fifo_size =3D 64, -> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *p= -ort) -> =20 +> [PORT_16550A_FSL64] = { +> .name = "16550A_FSL64", +> .fifo_size = 64, +> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port) +> > serial8250_set_mctrl(port, port->mctrl); -> =20 +> > - /* Serial over Lan (SoL) hack: > - Intel 8257x Gigabit ethernet chips have a > - 16550 emulation, to be used for Serial Over Lan. @@ -120,15 +111,12 @@ Might as well unwrap this to max line length too. > if (up->port.flags & UPF_NO_TXEN_TEST) > goto dont_test_tx_en; -> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial= -/8250/serial_cs.c +> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c > index f5270ba..a4bdcf6 100644 > --- a/drivers/tty/serial/8250/serial_cs.c > +++ b/drivers/tty/serial/8250/serial_cs.c > @@ -1,35 +1,37 @@ -> -/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> -/*====================================================================== > - > - A driver for PCMCIA serial devices > - @@ -145,31 +133,23 @@ Might as well unwrap this to max line length too. > - rights and limitations under the License. > - > - The initial developer of the original code is David A. Hinds -> - <dahinds@users.sourceforge.net>. Portions created by David A. H= -inds +> - <dahinds@users.sourceforge.net>. Portions created by David A. Hinds > - are Copyright (C) 1999 David A. Hinds. All Rights Reserved. > - > - Alternatively, the contents of this file may be used under the -> - terms of the GNU General Public License version 2 (the "GPL"), i= -n which +> - terms of the GNU General Public License version 2 (the "GPL"), in which > - case the provisions of the GPL are applicable instead of the -> - above. If you wish to allow the use of your version of this fil= -e +> - above. If you wish to allow the use of your version of this file > - only under the terms of the GPL and not to allow others to use > - your version of this file under the MPL, indicate your decision -> - by deleting the provisions above and replace them with the notic= -e +> - by deleting the provisions above and replace them with the notice > - and other provisions required by the GPL. If you do not delete > - the provisions above, a recipient may use your version of this > - file under either the MPL or the GPL. -> - =20 -> -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/ +> - +> -======================================================================*/ > +/* -> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> + * ====================================================================== > + * > + * A driver for PCMCIA serial devices > + * @@ -186,13 +166,11 @@ e > + * rights and limitations under the License. > + * > + * The initial developer of the original code is David A. Hinds -> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hi= -nds +> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds > + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. > + * > + * Alternatively, the contents of this file may be used under the -> + * terms of the GNU General Public License version 2 (the "GPL"), in= - which +> + * terms of the GNU General Public License version 2 (the "GPL"), in which > + * case the provisions of the GPL are applicable instead of the > + * above. If you wish to allow the use of your version of this file > + * only under the terms of the GPL and not to allow others to use @@ -202,29 +180,26 @@ nds > + * the provisions above, a recipient may use your version of this > + * file under either the MPL or the GPL. > + * -> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> + * ====================================================================== > + */ -> =20 +> > #include <linux/module.h> > #include <linux/moduleparam.h> -> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *= -link) -> struct serial_info *info =3D link->priv; -> int i =3D -ENODEV, try; -> =20 +> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link) +> struct serial_info *info = link->priv; +> int i = -ENODEV, try; +> > - /* First pass: look for a config entry that looks normal. > - * Two tries: without IO aliases, then with aliases */ > + /* > + * First pass: look for a config entry that looks normal. > + * Two tries: without IO aliases, then with aliases > + */ -> link->config_flags |=3D CONF_AUTO_SET_VPP; -> for (try =3D 0; try < 4; try++) +> link->config_flags |= CONF_AUTO_SET_VPP; +> for (try = 0; try < 4; try++) > if (!pcmcia_loop_config(link, simple_config_check, &try)) > goto found_port; -> =20 +> > - /* Second pass: try to find an entry that isn't picky about > - its base address, then try to grab any standard serial port > - address, and finally try to get any free port. */ @@ -235,33 +210,31 @@ link) > + */ > if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL)) > goto found_port; -> =20 -> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_devi= -ce *p_dev, void *priv_data) +> +> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data) > if (p_dev->resource[1]->end) > return -EINVAL; -> =20 +> > - /* The quad port cards have bad CIS's, so just look for a > - window larger than 8 ports and assume it will be right */ > + /* > + * The quad port cards have bad CIS's, so just look for a > + * window larger than 8 ports and assume it will be right > + */ -> if (p_dev->resource[0]->end <=3D 8) +> if (p_dev->resource[0]->end <= 8) > return -EINVAL; -> =20 -> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *l= -ink) +> +> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link) > break; > } -> =20 +> > - /* Another check for dual-serial cards: look for either serial or > - multifunction cards that ask for appropriate IO port ranges */ > + /* > + * Another check for dual-serial cards: look for either serial or > + * multifunction cards that ask for appropriate IO port ranges > + */ -> if ((info->multi =3D=3D 0) && +> if ((info->multi == 0) && > (link->has_func_id) && -> (link->socket->pcmcia_pfc =3D=3D 0) && ->=20 +> (link->socket->pcmcia_pfc == 0) && +> diff --git a/a/content_digest b/N1/content_digest index 00d6b98..90ee3ac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,35 +26,32 @@ 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" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" "> Checkpatch outputs some warnings about incorrect comment style,\n" "> which is fixed by this patch.\n" - ">=20\n" + "> \n" "\n" "Please fix the comments in a consistent fashion. For example ...\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_ingenic.c | 6 ++-\n" "> drivers/tty/serial/8250/8250_pnp.c | 6 ++-\n" "> drivers/tty/serial/8250/8250_port.c | 29 ++++++-----\n" - "> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++-----=\n" - "----------\n" + "> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++---------------\n" "> 4 files changed, 75 insertions(+), 58 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/ser=\n" - "ial/8250/8250_ingenic.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c\n" "> index 49394b4..c53d2501 100644\n" "> --- a/drivers/tty/serial/8250/8250_ingenic.c\n" "> +++ b/drivers/tty/serial/8250/8250_ingenic.c\n" - "> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart=\n" - "_port *p, int offset, int value)\n" - "> =20\n" + "> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)\n" + "> \n" "> \tcase UART_IER:\n" "> \t\t/* Enable receive timeout interrupt with the\n" "> -\t\t * receive line status interrupt */\n" @@ -63,24 +60,22 @@ "\n" "This isn't the same style as ...\n" "\n" - "> \t\tvalue |=3D (value & 0x4) << 2;\n" + "> \t\tvalue |= (value & 0x4) << 2;\n" "> \t\tbreak;\n" - "> =20\n" + "> \n" "> \tcase UART_MCR:\n" "> \t\t/* If we have enabled modem status IRQs we should enable modem\n" "> -\t\t * mode. */\n" "> +\t\t * mode.\n" "> +\t\t */\n" - "> \t\tier =3D p->serial_in(p, UART_IER);\n" - "> =20\n" + "> \t\tier = p->serial_in(p, UART_IER);\n" + "> \n" "> \t\tif (ier & UART_IER_MSI)\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 1f18065..2731031 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" - "> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[=\n" - "] =3D {\n" + "> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = {\n" "> \t{\t\"PNPCXXX\",\t\tUNKNOWN_DEV\t},\n" "> \t/* More unknown PnP modems */\n" "> \t{\t\"PNPDXXX\",\t\tUNKNOWN_DEV\t},\n" @@ -96,33 +91,29 @@ "> \t{\t\"WEC1022\",\t\tCIR_PORT\t},\n" "> \t/*\n" "> \t * SMSC IrCC SIR/FIR port, should not be probed by serial driver\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 57ad0f2..0ec823e 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" - "> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_confi=\n" - "g[] =3D {\n" - "> \t\t.fcr\t\t=3D UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,\n" - "> \t\t.flags\t\t=3D UART_CAP_FIFO | UART_CAP_AFE,\n" + "> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = {\n" + "> \t\t.fcr\t\t= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,\n" + "> \t\t.flags\t\t= UART_CAP_FIFO | UART_CAP_AFE,\n" "> \t},\n" "> -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement\n" "> -workaround of errata A-008006 which states that tx_loadsz should be\n" "> -configured less than Maximum supported fifo bytes */\n" "> +\t/*\n" "> +\t * tx_loadsz is set to 63-bytes instead of 64-bytes to implement\n" - "> +\t * workaround of errata A-008006 which states that tx_loadsz should=\n" - " be\n" + "> +\t * workaround of errata A-008006 which states that tx_loadsz should be\n" "> +\t * configured less than Maximum supported fifo bytes\n" "> +\t */\n" - "> \t[PORT_16550A_FSL64] =3D {\n" - "> \t\t.name\t\t=3D \"16550A_FSL64\",\n" - "> \t\t.fifo_size\t=3D 64,\n" - "> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *p=\n" - "ort)\n" - "> =20\n" + "> \t[PORT_16550A_FSL64] = {\n" + "> \t\t.name\t\t= \"16550A_FSL64\",\n" + "> \t\t.fifo_size\t= 64,\n" + "> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port)\n" + "> \n" "> \tserial8250_set_mctrl(port, port->mctrl);\n" - "> =20\n" + "> \n" "> -\t/* Serial over Lan (SoL) hack:\n" "> -\t Intel 8257x Gigabit ethernet chips have a\n" "> -\t 16550 emulation, to be used for Serial Over Lan.\n" @@ -151,15 +142,12 @@ "\n" "> \tif (up->port.flags & UPF_NO_TXEN_TEST)\n" "> \t\tgoto dont_test_tx_en;\n" - "> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial=\n" - "/8250/serial_cs.c\n" + "> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c\n" "> index f5270ba..a4bdcf6 100644\n" "> --- a/drivers/tty/serial/8250/serial_cs.c\n" "> +++ b/drivers/tty/serial/8250/serial_cs.c\n" "> @@ -1,35 +1,37 @@\n" - "> -/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> -/*======================================================================\n" "> -\n" "> - A driver for PCMCIA serial devices\n" "> -\n" @@ -176,31 +164,23 @@ "> - rights and limitations under the License.\n" "> -\n" "> - The initial developer of the original code is David A. Hinds\n" - "> - <dahinds@users.sourceforge.net>. Portions created by David A. H=\n" - "inds\n" + "> - <dahinds@users.sourceforge.net>. Portions created by David A. Hinds\n" "> - are Copyright (C) 1999 David A. Hinds. All Rights Reserved.\n" "> -\n" "> - Alternatively, the contents of this file may be used under the\n" - "> - terms of the GNU General Public License version 2 (the \"GPL\"), i=\n" - "n which\n" + "> - terms of the GNU General Public License version 2 (the \"GPL\"), in which\n" "> - case the provisions of the GPL are applicable instead of the\n" - "> - above. If you wish to allow the use of your version of this fil=\n" - "e\n" + "> - above. If you wish to allow the use of your version of this file\n" "> - only under the terms of the GPL and not to allow others to use\n" "> - your version of this file under the MPL, indicate your decision\n" - "> - by deleting the provisions above and replace them with the notic=\n" - "e\n" + "> - by deleting the provisions above and replace them with the notice\n" "> - and other provisions required by the GPL. If you do not delete\n" "> - the provisions above, a recipient may use your version of this\n" "> - file under either the MPL or the GPL.\n" - "> - =20\n" - "> -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/\n" + "> - \n" + "> -======================================================================*/\n" "> +/*\n" - "> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> + * ======================================================================\n" "> + *\n" "> + * A driver for PCMCIA serial devices\n" "> + *\n" @@ -217,13 +197,11 @@ "> + * rights and limitations under the License.\n" "> + *\n" "> + * The initial developer of the original code is David A. Hinds\n" - "> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hi=\n" - "nds\n" + "> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds\n" "> + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.\n" "> + *\n" "> + * Alternatively, the contents of this file may be used under the\n" - "> + * terms of the GNU General Public License version 2 (the \"GPL\"), in=\n" - " which\n" + "> + * terms of the GNU General Public License version 2 (the \"GPL\"), in which\n" "> + * case the provisions of the GPL are applicable instead of the\n" "> + * above. If you wish to allow the use of your version of this file\n" "> + * only under the terms of the GPL and not to allow others to use\n" @@ -233,29 +211,26 @@ "> + * the provisions above, a recipient may use your version of this\n" "> + * file under either the MPL or the GPL.\n" "> + *\n" - "> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> + * ======================================================================\n" "> + */\n" - "> =20\n" + "> \n" "> #include <linux/module.h>\n" "> #include <linux/moduleparam.h>\n" - "> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *=\n" - "link)\n" - "> \tstruct serial_info *info =3D link->priv;\n" - "> \tint i =3D -ENODEV, try;\n" - "> =20\n" + "> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link)\n" + "> \tstruct serial_info *info = link->priv;\n" + "> \tint i = -ENODEV, try;\n" + "> \n" "> -\t/* First pass: look for a config entry that looks normal.\n" "> -\t * Two tries: without IO aliases, then with aliases */\n" "> +\t/*\n" "> +\t * First pass: look for a config entry that looks normal.\n" "> +\t * Two tries: without IO aliases, then with aliases\n" "> +\t */\n" - "> \tlink->config_flags |=3D CONF_AUTO_SET_VPP;\n" - "> \tfor (try =3D 0; try < 4; try++)\n" + "> \tlink->config_flags |= CONF_AUTO_SET_VPP;\n" + "> \tfor (try = 0; try < 4; try++)\n" "> \t\tif (!pcmcia_loop_config(link, simple_config_check, &try))\n" "> \t\t\tgoto found_port;\n" - "> =20\n" + "> \n" "> -\t/* Second pass: try to find an entry that isn't picky about\n" "> -\t its base address, then try to grab any standard serial port\n" "> -\t address, and finally try to get any free port. */\n" @@ -266,35 +241,33 @@ "> +\t */\n" "> \tif (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))\n" "> \t\tgoto found_port;\n" - "> =20\n" - "> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_devi=\n" - "ce *p_dev, void *priv_data)\n" + "> \n" + "> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)\n" "> \tif (p_dev->resource[1]->end)\n" "> \t\treturn -EINVAL;\n" - "> =20\n" + "> \n" "> -\t/* The quad port cards have bad CIS's, so just look for a\n" "> -\t window larger than 8 ports and assume it will be right */\n" "> +\t/*\n" "> +\t * The quad port cards have bad CIS's, so just look for a\n" "> +\t * window larger than 8 ports and assume it will be right\n" "> +\t */\n" - "> \tif (p_dev->resource[0]->end <=3D 8)\n" + "> \tif (p_dev->resource[0]->end <= 8)\n" "> \t\treturn -EINVAL;\n" - "> =20\n" - "> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *l=\n" - "ink)\n" + "> \n" + "> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link)\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> =20\n" + "> \n" "> -\t/* Another check for dual-serial cards: look for either serial or\n" "> -\t multifunction cards that ask for appropriate IO port ranges */\n" "> +\t/*\n" "> +\t * Another check for dual-serial cards: look for either serial or\n" "> +\t * multifunction cards that ask for appropriate IO port ranges\n" "> +\t */\n" - "> \tif ((info->multi =3D=3D 0) &&\n" + "> \tif ((info->multi == 0) &&\n" "> \t (link->has_func_id) &&\n" - "> \t (link->socket->pcmcia_pfc =3D=3D 0) &&\n" - >=20 + "> \t (link->socket->pcmcia_pfc == 0) &&\n" + > -0f62dcbfd6c77192236359e1cc076bb8f9740fbafd52bc26573fb61f7e642aaf +0b59e97a1bb9443004ec62bc806504ddd3774a73a8d1b283f0cd22b06c400c77
diff --git a/a/1.txt b/N2/1.txt index 9d76f3e..313fffb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,29 +1,26 @@ On 12/16/2015 07:36 AM, Anton Wuerfel wrote: > Checkpatch outputs some warnings about incorrect comment style, > which is fixed by this patch. ->=20 +> Please fix the comments in a consistent fashion. For example ... -> 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_ingenic.c | 6 ++- > drivers/tty/serial/8250/8250_pnp.c | 6 ++- > drivers/tty/serial/8250/8250_port.c | 29 ++++++----- -> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++-----= ----------- +> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++--------------- > 4 files changed, 75 insertions(+), 58 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/ser= -ial/8250/8250_ingenic.c +> +> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c > index 49394b4..c53d2501 100644 > --- a/drivers/tty/serial/8250/8250_ingenic.c > +++ b/drivers/tty/serial/8250/8250_ingenic.c -> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart= -_port *p, int offset, int value) -> =20 +> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value) +> > case UART_IER: > /* Enable receive timeout interrupt with the > - * receive line status interrupt */ @@ -32,24 +29,22 @@ _port *p, int offset, int value) This isn't the same style as ... -> value |=3D (value & 0x4) << 2; +> value |= (value & 0x4) << 2; > break; -> =20 +> > case UART_MCR: > /* If we have enabled modem status IRQs we should enable modem > - * mode. */ > + * mode. > + */ -> ier =3D p->serial_in(p, UART_IER); -> =20 +> ier = p->serial_in(p, UART_IER); +> > if (ier & UART_IER_MSI) -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 1f18065..2731031 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c -> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[= -] =3D { +> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = { > { "PNPCXXX", UNKNOWN_DEV }, > /* More unknown PnP modems */ > { "PNPDXXX", UNKNOWN_DEV }, @@ -65,33 +60,29 @@ this style. > { "WEC1022", CIR_PORT }, > /* > * SMSC IrCC SIR/FIR port, should not be probed by serial driver -> 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 57ad0f2..0ec823e 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c -> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_confi= -g[] =3D { -> .fcr =3D UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, -> .flags =3D UART_CAP_FIFO | UART_CAP_AFE, +> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = { +> .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, +> .flags = UART_CAP_FIFO | UART_CAP_AFE, > }, > -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement > -workaround of errata A-008006 which states that tx_loadsz should be > -configured less than Maximum supported fifo bytes */ > + /* > + * tx_loadsz is set to 63-bytes instead of 64-bytes to implement -> + * workaround of errata A-008006 which states that tx_loadsz should= - be +> + * workaround of errata A-008006 which states that tx_loadsz should be > + * configured less than Maximum supported fifo bytes > + */ -> [PORT_16550A_FSL64] =3D { -> .name =3D "16550A_FSL64", -> .fifo_size =3D 64, -> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *p= -ort) -> =20 +> [PORT_16550A_FSL64] = { +> .name = "16550A_FSL64", +> .fifo_size = 64, +> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port) +> > serial8250_set_mctrl(port, port->mctrl); -> =20 +> > - /* Serial over Lan (SoL) hack: > - Intel 8257x Gigabit ethernet chips have a > - 16550 emulation, to be used for Serial Over Lan. @@ -120,15 +111,12 @@ Might as well unwrap this to max line length too. > if (up->port.flags & UPF_NO_TXEN_TEST) > goto dont_test_tx_en; -> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial= -/8250/serial_cs.c +> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c > index f5270ba..a4bdcf6 100644 > --- a/drivers/tty/serial/8250/serial_cs.c > +++ b/drivers/tty/serial/8250/serial_cs.c > @@ -1,35 +1,37 @@ -> -/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> -/*====================================================================== > - > - A driver for PCMCIA serial devices > - @@ -145,31 +133,23 @@ Might as well unwrap this to max line length too. > - rights and limitations under the License. > - > - The initial developer of the original code is David A. Hinds -> - <dahinds@users.sourceforge.net>. Portions created by David A. H= -inds +> - <dahinds@users.sourceforge.net>. Portions created by David A. Hinds > - are Copyright (C) 1999 David A. Hinds. All Rights Reserved. > - > - Alternatively, the contents of this file may be used under the -> - terms of the GNU General Public License version 2 (the "GPL"), i= -n which +> - terms of the GNU General Public License version 2 (the "GPL"), in which > - case the provisions of the GPL are applicable instead of the -> - above. If you wish to allow the use of your version of this fil= -e +> - above. If you wish to allow the use of your version of this file > - only under the terms of the GPL and not to allow others to use > - your version of this file under the MPL, indicate your decision -> - by deleting the provisions above and replace them with the notic= -e +> - by deleting the provisions above and replace them with the notice > - and other provisions required by the GPL. If you do not delete > - the provisions above, a recipient may use your version of this > - file under either the MPL or the GPL. -> - =20 -> -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/ +> - +> -======================================================================*/ > +/* -> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> + * ====================================================================== > + * > + * A driver for PCMCIA serial devices > + * @@ -186,13 +166,11 @@ e > + * rights and limitations under the License. > + * > + * The initial developer of the original code is David A. Hinds -> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hi= -nds +> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds > + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. > + * > + * Alternatively, the contents of this file may be used under the -> + * terms of the GNU General Public License version 2 (the "GPL"), in= - which +> + * terms of the GNU General Public License version 2 (the "GPL"), in which > + * case the provisions of the GPL are applicable instead of the > + * above. If you wish to allow the use of your version of this file > + * only under the terms of the GPL and not to allow others to use @@ -202,29 +180,26 @@ nds > + * the provisions above, a recipient may use your version of this > + * file under either the MPL or the GPL. > + * -> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +> + * ====================================================================== > + */ -> =20 +> > #include <linux/module.h> > #include <linux/moduleparam.h> -> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *= -link) -> struct serial_info *info =3D link->priv; -> int i =3D -ENODEV, try; -> =20 +> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link) +> struct serial_info *info = link->priv; +> int i = -ENODEV, try; +> > - /* First pass: look for a config entry that looks normal. > - * Two tries: without IO aliases, then with aliases */ > + /* > + * First pass: look for a config entry that looks normal. > + * Two tries: without IO aliases, then with aliases > + */ -> link->config_flags |=3D CONF_AUTO_SET_VPP; -> for (try =3D 0; try < 4; try++) +> link->config_flags |= CONF_AUTO_SET_VPP; +> for (try = 0; try < 4; try++) > if (!pcmcia_loop_config(link, simple_config_check, &try)) > goto found_port; -> =20 +> > - /* Second pass: try to find an entry that isn't picky about > - its base address, then try to grab any standard serial port > - address, and finally try to get any free port. */ @@ -235,33 +210,31 @@ link) > + */ > if (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL)) > goto found_port; -> =20 -> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_devi= -ce *p_dev, void *priv_data) +> +> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data) > if (p_dev->resource[1]->end) > return -EINVAL; -> =20 +> > - /* The quad port cards have bad CIS's, so just look for a > - window larger than 8 ports and assume it will be right */ > + /* > + * The quad port cards have bad CIS's, so just look for a > + * window larger than 8 ports and assume it will be right > + */ -> if (p_dev->resource[0]->end <=3D 8) +> if (p_dev->resource[0]->end <= 8) > return -EINVAL; -> =20 -> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *l= -ink) +> +> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link) > break; > } -> =20 +> > - /* Another check for dual-serial cards: look for either serial or > - multifunction cards that ask for appropriate IO port ranges */ > + /* > + * Another check for dual-serial cards: look for either serial or > + * multifunction cards that ask for appropriate IO port ranges > + */ -> if ((info->multi =3D=3D 0) && +> if ((info->multi == 0) && > (link->has_func_id) && -> (link->socket->pcmcia_pfc =3D=3D 0) && ->=20 +> (link->socket->pcmcia_pfc == 0) && +> diff --git a/a/content_digest b/N2/content_digest index 00d6b98..8e4dae0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -26,35 +26,32 @@ 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" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" "> Checkpatch outputs some warnings about incorrect comment style,\n" "> which is fixed by this patch.\n" - ">=20\n" + "> \n" "\n" "Please fix the comments in a consistent fashion. For example ...\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_ingenic.c | 6 ++-\n" "> drivers/tty/serial/8250/8250_pnp.c | 6 ++-\n" "> drivers/tty/serial/8250/8250_port.c | 29 ++++++-----\n" - "> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++-----=\n" - "----------\n" + "> drivers/tty/serial/8250/serial_cs.c | 92 +++++++++++++++++++---------------\n" "> 4 files changed, 75 insertions(+), 58 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/ser=\n" - "ial/8250/8250_ingenic.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c\n" "> index 49394b4..c53d2501 100644\n" "> --- a/drivers/tty/serial/8250/8250_ingenic.c\n" "> +++ b/drivers/tty/serial/8250/8250_ingenic.c\n" - "> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart=\n" - "_port *p, int offset, int value)\n" - "> =20\n" + "> @@ -153,13 +153,15 @@ static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)\n" + "> \n" "> \tcase UART_IER:\n" "> \t\t/* Enable receive timeout interrupt with the\n" "> -\t\t * receive line status interrupt */\n" @@ -63,24 +60,22 @@ "\n" "This isn't the same style as ...\n" "\n" - "> \t\tvalue |=3D (value & 0x4) << 2;\n" + "> \t\tvalue |= (value & 0x4) << 2;\n" "> \t\tbreak;\n" - "> =20\n" + "> \n" "> \tcase UART_MCR:\n" "> \t\t/* If we have enabled modem status IRQs we should enable modem\n" "> -\t\t * mode. */\n" "> +\t\t * mode.\n" "> +\t\t */\n" - "> \t\tier =3D p->serial_in(p, UART_IER);\n" - "> =20\n" + "> \t\tier = p->serial_in(p, UART_IER);\n" + "> \n" "> \t\tif (ier & UART_IER_MSI)\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 1f18065..2731031 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" - "> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[=\n" - "] =3D {\n" + "> @@ -367,8 +367,10 @@ static const struct pnp_device_id pnp_dev_table[] = {\n" "> \t{\t\"PNPCXXX\",\t\tUNKNOWN_DEV\t},\n" "> \t/* More unknown PnP modems */\n" "> \t{\t\"PNPDXXX\",\t\tUNKNOWN_DEV\t},\n" @@ -96,33 +91,29 @@ "> \t{\t\"WEC1022\",\t\tCIR_PORT\t},\n" "> \t/*\n" "> \t * SMSC IrCC SIR/FIR port, should not be probed by serial driver\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 57ad0f2..0ec823e 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" - "> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_confi=\n" - "g[] =3D {\n" - "> \t\t.fcr\t\t=3D UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,\n" - "> \t\t.flags\t\t=3D UART_CAP_FIFO | UART_CAP_AFE,\n" + "> @@ -250,9 +250,11 @@ static const struct serial8250_config uart_config[] = {\n" + "> \t\t.fcr\t\t= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,\n" + "> \t\t.flags\t\t= UART_CAP_FIFO | UART_CAP_AFE,\n" "> \t},\n" "> -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement\n" "> -workaround of errata A-008006 which states that tx_loadsz should be\n" "> -configured less than Maximum supported fifo bytes */\n" "> +\t/*\n" "> +\t * tx_loadsz is set to 63-bytes instead of 64-bytes to implement\n" - "> +\t * workaround of errata A-008006 which states that tx_loadsz should=\n" - " be\n" + "> +\t * workaround of errata A-008006 which states that tx_loadsz should be\n" "> +\t * configured less than Maximum supported fifo bytes\n" "> +\t */\n" - "> \t[PORT_16550A_FSL64] =3D {\n" - "> \t\t.name\t\t=3D \"16550A_FSL64\",\n" - "> \t\t.fifo_size\t=3D 64,\n" - "> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *p=\n" - "ort)\n" - "> =20\n" + "> \t[PORT_16550A_FSL64] = {\n" + "> \t\t.name\t\t= \"16550A_FSL64\",\n" + "> \t\t.fifo_size\t= 64,\n" + "> @@ -1970,16 +1972,17 @@ int serial8250_do_startup(struct uart_port *port)\n" + "> \n" "> \tserial8250_set_mctrl(port, port->mctrl);\n" - "> =20\n" + "> \n" "> -\t/* Serial over Lan (SoL) hack:\n" "> -\t Intel 8257x Gigabit ethernet chips have a\n" "> -\t 16550 emulation, to be used for Serial Over Lan.\n" @@ -151,15 +142,12 @@ "\n" "> \tif (up->port.flags & UPF_NO_TXEN_TEST)\n" "> \t\tgoto dont_test_tx_en;\n" - "> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial=\n" - "/8250/serial_cs.c\n" + "> diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c\n" "> index f5270ba..a4bdcf6 100644\n" "> --- a/drivers/tty/serial/8250/serial_cs.c\n" "> +++ b/drivers/tty/serial/8250/serial_cs.c\n" "> @@ -1,35 +1,37 @@\n" - "> -/*=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> -/*======================================================================\n" "> -\n" "> - A driver for PCMCIA serial devices\n" "> -\n" @@ -176,31 +164,23 @@ "> - rights and limitations under the License.\n" "> -\n" "> - The initial developer of the original code is David A. Hinds\n" - "> - <dahinds@users.sourceforge.net>. Portions created by David A. H=\n" - "inds\n" + "> - <dahinds@users.sourceforge.net>. Portions created by David A. Hinds\n" "> - are Copyright (C) 1999 David A. Hinds. All Rights Reserved.\n" "> -\n" "> - Alternatively, the contents of this file may be used under the\n" - "> - terms of the GNU General Public License version 2 (the \"GPL\"), i=\n" - "n which\n" + "> - terms of the GNU General Public License version 2 (the \"GPL\"), in which\n" "> - case the provisions of the GPL are applicable instead of the\n" - "> - above. If you wish to allow the use of your version of this fil=\n" - "e\n" + "> - above. If you wish to allow the use of your version of this file\n" "> - only under the terms of the GPL and not to allow others to use\n" "> - your version of this file under the MPL, indicate your decision\n" - "> - by deleting the provisions above and replace them with the notic=\n" - "e\n" + "> - by deleting the provisions above and replace them with the notice\n" "> - and other provisions required by the GPL. If you do not delete\n" "> - the provisions above, a recipient may use your version of this\n" "> - file under either the MPL or the GPL.\n" - "> - =20\n" - "> -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D*/\n" + "> - \n" + "> -======================================================================*/\n" "> +/*\n" - "> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> + * ======================================================================\n" "> + *\n" "> + * A driver for PCMCIA serial devices\n" "> + *\n" @@ -217,13 +197,11 @@ "> + * rights and limitations under the License.\n" "> + *\n" "> + * The initial developer of the original code is David A. Hinds\n" - "> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hi=\n" - "nds\n" + "> + * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds\n" "> + * are Copyright (C) 1999 David A. Hinds. All Rights Reserved.\n" "> + *\n" "> + * Alternatively, the contents of this file may be used under the\n" - "> + * terms of the GNU General Public License version 2 (the \"GPL\"), in=\n" - " which\n" + "> + * terms of the GNU General Public License version 2 (the \"GPL\"), in which\n" "> + * case the provisions of the GPL are applicable instead of the\n" "> + * above. If you wish to allow the use of your version of this file\n" "> + * only under the terms of the GPL and not to allow others to use\n" @@ -233,29 +211,26 @@ "> + * the provisions above, a recipient may use your version of this\n" "> + * file under either the MPL or the GPL.\n" "> + *\n" - "> + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "> + * ======================================================================\n" "> + */\n" - "> =20\n" + "> \n" "> #include <linux/module.h>\n" "> #include <linux/moduleparam.h>\n" - "> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *=\n" - "link)\n" - "> \tstruct serial_info *info =3D link->priv;\n" - "> \tint i =3D -ENODEV, try;\n" - "> =20\n" + "> @@ -441,16 +443,20 @@ static int simple_config(struct pcmcia_device *link)\n" + "> \tstruct serial_info *info = link->priv;\n" + "> \tint i = -ENODEV, try;\n" + "> \n" "> -\t/* First pass: look for a config entry that looks normal.\n" "> -\t * Two tries: without IO aliases, then with aliases */\n" "> +\t/*\n" "> +\t * First pass: look for a config entry that looks normal.\n" "> +\t * Two tries: without IO aliases, then with aliases\n" "> +\t */\n" - "> \tlink->config_flags |=3D CONF_AUTO_SET_VPP;\n" - "> \tfor (try =3D 0; try < 4; try++)\n" + "> \tlink->config_flags |= CONF_AUTO_SET_VPP;\n" + "> \tfor (try = 0; try < 4; try++)\n" "> \t\tif (!pcmcia_loop_config(link, simple_config_check, &try))\n" "> \t\t\tgoto found_port;\n" - "> =20\n" + "> \n" "> -\t/* Second pass: try to find an entry that isn't picky about\n" "> -\t its base address, then try to grab any standard serial port\n" "> -\t address, and finally try to get any free port. */\n" @@ -266,35 +241,33 @@ "> +\t */\n" "> \tif (!pcmcia_loop_config(link, simple_config_check_notpicky, NULL))\n" "> \t\tgoto found_port;\n" - "> =20\n" - "> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_devi=\n" - "ce *p_dev, void *priv_data)\n" + "> \n" + "> @@ -480,8 +486,10 @@ static int multi_config_check(struct pcmcia_device *p_dev, void *priv_data)\n" "> \tif (p_dev->resource[1]->end)\n" "> \t\treturn -EINVAL;\n" - "> =20\n" + "> \n" "> -\t/* The quad port cards have bad CIS's, so just look for a\n" "> -\t window larger than 8 ports and assume it will be right */\n" "> +\t/*\n" "> +\t * The quad port cards have bad CIS's, so just look for a\n" "> +\t * window larger than 8 ports and assume it will be right\n" "> +\t */\n" - "> \tif (p_dev->resource[0]->end <=3D 8)\n" + "> \tif (p_dev->resource[0]->end <= 8)\n" "> \t\treturn -EINVAL;\n" - "> =20\n" - "> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *l=\n" - "ink)\n" + "> \n" + "> @@ -623,8 +631,10 @@ static int serial_config(struct pcmcia_device *link)\n" "> \t\t\tbreak;\n" "> \t\t}\n" - "> =20\n" + "> \n" "> -\t/* Another check for dual-serial cards: look for either serial or\n" "> -\t multifunction cards that ask for appropriate IO port ranges */\n" "> +\t/*\n" "> +\t * Another check for dual-serial cards: look for either serial or\n" "> +\t * multifunction cards that ask for appropriate IO port ranges\n" "> +\t */\n" - "> \tif ((info->multi =3D=3D 0) &&\n" + "> \tif ((info->multi == 0) &&\n" "> \t (link->has_func_id) &&\n" - "> \t (link->socket->pcmcia_pfc =3D=3D 0) &&\n" - >=20 + "> \t (link->socket->pcmcia_pfc == 0) &&\n" + > -0f62dcbfd6c77192236359e1cc076bb8f9740fbafd52bc26573fb61f7e642aaf +ff6c41979f341e542572e3aaa96489dba3c364509223ce48013f6999158e5b2c
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.