diff for duplicates of <1450280177-4460-5-git-send-email-anton.wuerfel@fau.de>

diff --git a/a/1.txt b/N1/1.txt
index e204417..af571e3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,48 +1,43 @@
 Checkpatch outputs some warnings about incorrect comment style,
 which is fixed by this patch.
 
-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(-)
 
-diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/seria=
-l/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_p=
-ort *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 */
 +		 * receive line status interrupt
 +		 */
- 		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/82=
-50/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	},
@@ -55,33 +50,29 @@ index 1f18065..2731031 100644
  	{	"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/8=
-250/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_config[=
-] =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 b=
-e
++	 * 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 *por=
-t)
-=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.
@@ -106,15 +97,12 @@ t)
  	 */
  	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/8=
-250/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
 -
@@ -131,13 +119,11 @@ index f5270ba..a4bdcf6 100644
 -    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. Hin=
-ds
+-    <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
@@ -146,14 +132,10 @@ which
 -    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
 + *
@@ -170,13 +152,11 @@ which
 + * 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. Hind=
-s
++ * <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 w=
-hich
++ * 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
@@ -186,29 +166,26 @@ hich
 + * 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 *li=
-nk)
- 	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. */
@@ -219,34 +196,32 @@ nk)
 +	 */
  	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_device=
- *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 *lin=
-k)
+ 
+@@ -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) &&
+-- 
 1.9.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a6d1ebe..444628d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -36,7 +36,8 @@
   " linux-kernel\@vger.kernel.org",
   " linux-parisc\@vger.kernel.org",
   " linux-kernel\@i4.cs.fau.de",
-  " Anton Wuerfel <anto\0"
+  " Anton Wuerfel <anton.wuerfel\@fau.de>",
+  " Phillip Raffeck <phillip.raffeck\@fau.de>\0"
 ]
 [
   "\0000:1\0"
@@ -48,48 +49,43 @@
   "Checkpatch outputs some warnings about incorrect comment style,\n",
   "which is fixed by this patch.\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",
   "\n",
-  "diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/seria=\n",
-  "l/8250/8250_ingenic.c\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_p=\n",
-  "ort *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",
   "+\t\t * receive line status interrupt\n",
   "+\t\t */\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/82=\n",
-  "50/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",
@@ -102,33 +98,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/8=\n",
-  "250/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_config[=\n",
-  "] =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 b=\n",
-  "e\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 *por=\n",
-  "t)\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",
@@ -153,15 +145,12 @@
   " \t */\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/8=\n",
-  "250/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=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",
   "-    A driver for PCMCIA serial devices\n",
   "-\n",
@@ -178,13 +167,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. Hin=\n",
-  "ds\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",
@@ -193,14 +180,10 @@
   "-    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=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*/\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=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",
   "+ * A driver for PCMCIA serial devices\n",
   "+ *\n",
@@ -217,13 +200,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. Hind=\n",
-  "s\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 w=\n",
-  "hich\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 +214,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=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",
-  "=20\n",
+  " \n",
   " #include <linux/module.h>\n",
   " #include <linux/moduleparam.h>\n",
-  "\@\@ -441,16 +443,20 \@\@ static int simple_config(struct pcmcia_device *li=\n",
-  "nk)\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,37 +244,35 @@
   "+\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_device=\n",
-  " *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 *lin=\n",
-  "k)\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\n",
+  " \t    (link->socket->pcmcia_pfc == 0) &&\n",
+  "-- \n",
   "1.9.1"
 ]
 
-bca6aac073460408f964f937d7f8ffe6cb307a75c8d9c22872443267a6f5f626
+1274e8980ecd4569f59b690afe444570c3127ae98495ec356c5d5af8086911f9
