diff for duplicates of <567194C3.1050606@hurleysoftware.com>
diff --git a/a/1.txt b/N1/1.txt
index 4432fff..a2610f7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,7 +7,7 @@ On 12/16/2015 07:36 AM, Anton Wuerfel wrote:
Comments below.
-> 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
> ---
@@ -22,182 +22,168 @@ Comments below.
> drivers/tty/serial/8250/8250_hub6.c | 2 +-
> drivers/tty/serial/8250/8250_pci.c | 7 +++-
> drivers/tty/serial/8250/8250_port.c | 3 ++
-> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++----=
-----------
+> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++--------------
> 12 files changed, 52 insertions(+), 36 deletions(-)
->=20
-> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/seri=
-al/8250/8250_accent.c
+>
+> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
> index 34b51c6..c480729 100644
> --- a/drivers/tty/serial/8250/8250_accent.c
> +++ b/drivers/tty/serial/8250/8250_accent.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/seria=
-l/8250/8250_acorn.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
> index 549aa07..402dfdd 100644
> --- a/drivers/tty/serial/8250/8250_acorn.c
> +++ b/drivers/tty/serial/8250/8250_acorn.c
-> @@ -70,7 +70,7 @@ serial_card_probe(struct expansion_card *ec, const =
-struct ecard_id *id)
-> uart.port.regshift =3D 2;
-> uart.port.dev =3D &ec->dev;
-> =20
-> - for (i =3D 0; i < info->num_ports; i ++) {
-> + for (i =3D 0; i < info->num_ports; i++) {
+> @@ -70,7 +70,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
+> uart.port.regshift = 2;
+> uart.port.dev = &ec->dev;
+>
+> - for (i = 0; i < info->num_ports; i ++) {
+> + for (i = 0; i < info->num_ports; i++) {
Ok
-> uart.port.membase =3D info->vaddr + type->offset[i];
-> uart.port.mapbase =3D bus_addr + type->offset[i];
-> =20
-> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial=
-/8250/8250_boca.c
+> uart.port.membase = info->vaddr + type->offset[i];
+> uart.port.mapbase = bus_addr + type->offset[i];
+>
+> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
> index d125dc1..e42a5b5 100644
> --- a/drivers/tty/serial/8250/8250_boca.c
> +++ b/drivers/tty/serial/8250/8250_boca.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=
-/8250/8250_core.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 3912646..89a20c9 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -756,6 +756,7 @@ void serial8250_suspend_port(int line)
> if (!console_suspend_enabled && uart_console(port) &&
-> port->type !=3D PORT_8250) {
-> unsigned char canary =3D 0xa5;
+> port->type != PORT_8250) {
+> unsigned char canary = 0xa5;
> +
Not ok.
> serial_out(up, UART_SCR, canary);
-> if (serial_in(up, UART_SCR) =3D=3D canary)
-> up->canary =3D canary;
-> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8=
-250/8250_dw.c
+> if (serial_in(up, UART_SCR) == canary)
+> up->canary = canary;
+> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
> index a5d319e..0f67355 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
-> @@ -102,8 +102,10 @@ static void dw8250_serial_out(struct uart_port *=
-p, int offset, int value)
+> @@ -102,8 +102,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> @@ -143,8 +145,10 @@ static void dw8250_serial_outq(struct uart_port =
-*p, int offset, int value)
+> @@ -143,8 +145,10 @@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
Not ok.
In particular, I dislike separation between initialized variables and
-following statements, _especially_ when the initialization is non-trivi=
-al.
+following statements, _especially_ when the initialization is non-trivial.
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> @@ -166,8 +170,10 @@ static void dw8250_serial_out32(struct uart_port=
- *p, int offset, int value)
+> @@ -166,8 +170,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
Not ok.
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/t=
-ty/serial/8250/8250_exar_st16c554.c
+> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
> index bf53aab..999f2d3 100644
> --- a/drivers/tty/serial/8250/8250_exar_st16c554.c
> +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
> @@ -13,7 +13,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/se=
-rial/8250/8250_fourport.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
> index be15826..9a04a8a 100644
> --- a/drivers/tty/serial/8250/8250_fourport.c
> +++ b/drivers/tty/serial/8250/8250_fourport.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=
-l/8250/8250_hp300.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
> index 2891958..38d8cb2 100644
> --- a/drivers/tty/serial/8250/8250_hp300.c
> +++ b/drivers/tty/serial/8250/8250_hp300.c
> @@ -125,6 +125,7 @@ int __init hp300_setup_serial_console(void)
> } else {
> #ifdef CONFIG_HPDCA
-> unsigned long pa =3D dio_scodetophysaddr(scode);
+> unsigned long pa = dio_scodetophysaddr(scode);
> +
> if (!pa)
> return 0;
@@ -205,71 +191,64 @@ l/8250/8250_hp300.c
Not ok.
This is a particularly good example of how bad that style is.
-The relevant code is the call to dio_scode_tophysaddr() _not the if (!p=
-a)_
+The relevant code is the call to dio_scode_tophysaddr() _not the if (!pa)_
Newline after uninitialized vars - ok.
-Newline after initialized vars - not ok. Unless trivial initialization =
-and
+Newline after initialized vars - not ok. Unless trivial initialization and
you wrote it.
-> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial=
-/8250/8250_hub6.c
+> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
> index a5c778e..27124e2 100644
> --- a/drivers/tty/serial/8250/8250_hub6.c
> +++ b/drivers/tty/serial/8250/8250_hub6.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define HUB6(card,port) \
> +#define HUB6(card, port) \
ok
> { \
-> .iobase =3D 0x302, \
-> .irq =3D 3, \
-> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=
-8250/8250_pci.c
+> .iobase = 0x302, \
+> .irq = 3, \
+> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
> index 4097f3f..ed99fdf 100644
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
-> @@ -113,6 +113,7 @@ static int addidata_apci7800_setup(struct serial_=
-private *priv,
+> @@ -113,6 +113,7 @@ static int addidata_apci7800_setup(struct serial_private *priv,
> struct uart_8250_port *port, int idx)
> {
-> unsigned int bar =3D 0, offset =3D board->first_offset;
+> unsigned int bar = 0, offset = board->first_offset;
> +
not ok
-> bar =3D FL_GET_BASE(board->flags);
-> =20
+> bar = FL_GET_BASE(board->flags);
+>
> if (idx < 2) {
-> @@ -1115,6 +1116,7 @@ static struct quatech_feature quatech_cards[] =3D=
- {
+> @@ -1115,6 +1116,7 @@ static struct quatech_feature quatech_cards[] = {
> static int pci_quatech_amcc(u16 devid)
> {
-> struct quatech_feature *qf =3D &quatech_cards[0];
+> struct quatech_feature *qf = &quatech_cards[0];
> +
not ok
> while (qf->devid) {
-> if (qf->devid =3D=3D devid)
+> if (qf->devid == devid)
> return qf->amcc;
-> @@ -1200,6 +1202,7 @@ static int pci_quatech_test(struct uart_8250_po=
-rt *port)
+> @@ -1200,6 +1202,7 @@ static int pci_quatech_test(struct uart_8250_port *port)
> {
> u8 reg;
-> u8 qopr =3D pci_quatech_rqopr(port);
+> u8 qopr = pci_quatech_rqopr(port);
> +
Swap the declaration order and its ok. IOW,
-+ u8 qopr =3D pci_quatech_rqopr(port);
++ u8 qopr = pci_quatech_rqopr(port);
+ u8 reg;
+
@@ -277,16 +256,15 @@ or even better
+ u8 reg, qopr;
+
-+ qopr =3D pci_quatech_rqopr(port);
++ qopr = pci_quatech_rqopr(port);
> pci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);
-> reg =3D pci_quatech_rqopr(port) & 0xC0;
-> if (reg !=3D QPCR_TEST_GET1)
-> @@ -1284,8 +1287,10 @@ static int pci_quatech_init(struct pci_dev *de=
-v)
+> reg = pci_quatech_rqopr(port) & 0xC0;
+> if (reg != QPCR_TEST_GET1)
+> @@ -1284,8 +1287,10 @@ static int pci_quatech_init(struct pci_dev *dev)
> {
> if (pci_quatech_amcc(dev->device)) {
-> unsigned long base =3D pci_resource_start(dev, 0);
+> unsigned long base = pci_resource_start(dev, 0);
> +
not ok
@@ -299,10 +277,9 @@ not ok
ok
> outl(inl(base + 0x38) | 0x00002000, base + 0x38);
-> tmp =3D inl(base + 0x3c);
+> tmp = inl(base + 0x3c);
> outl(tmp | 0x01000000, base + 0x3c);
-> @@ -4502,7 +4507,7 @@ static struct pci_device_id serial_pci_tbl[] =3D=
- {
+> @@ -4502,7 +4507,7 @@ static struct pci_device_id serial_pci_tbl[] = {
> PCI_ANY_ID, PCI_ANY_ID, 0, 0,
> pbn_b0_bt_2_921600 },
> { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
@@ -312,27 +289,24 @@ ok
ok
> pbn_b2_8_1152000 },
-> =20
+>
> /*
-> 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 52d82d2..ae8f993 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
-> @@ -1327,6 +1327,7 @@ static void serial8250_start_tx(struct uart_por=
-t *port)
-> =20
+> @@ -1327,6 +1327,7 @@ static void serial8250_start_tx(struct uart_port *port)
+>
> if (up->bugs & UART_BUG_TXEN) {
> unsigned char lsr;
> +
ok
-> lsr =3D serial_in(up, UART_LSR);
-> up->lsr_saved_flags |=3D lsr & LSR_SAVE_FLAGS;
+> lsr = serial_in(up, UART_LSR);
+> up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
> if (lsr & UART_LSR_THRE)
-> @@ -1734,8 +1735,10 @@ static void wait_for_xmitr(struct uart_8250_po=
-rt *up, int bits)
+> @@ -1734,8 +1735,10 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
> /* Wait up to 1s for flow control if necessary */
> if (up->port.flags & UPF_CONS_FLOW) {
> unsigned int tmout;
@@ -340,210 +314,134 @@ rt *up, int bits)
ok
-> for (tmout =3D 1000000; tmout; tmout--) {
-> unsigned int msr =3D serial_in(up, UART_MSR);
+> for (tmout = 1000000; tmout; tmout--) {
+> unsigned int msr = serial_in(up, UART_MSR);
> +
not ok
-> up->msr_saved_flags |=3D msr & MSR_SAVE_FLAGS;
+> up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
> if (msr & UART_MSR_CTS)
> break;
-> 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 4d180c9..f5270ba 100644
> --- a/drivers/tty/serial/8250/serial_cs.c
> +++ b/drivers/tty/serial/8250/serial_cs.c
-> @@ -257,7 +257,7 @@ static const struct serial_quirk quirks[] =3D {
+> @@ -257,7 +257,7 @@ static const struct serial_quirk quirks[] = {
> };
-> =20
-> =20
+>
+>
> -static int serial_config(struct pcmcia_device * link);
> +static int serial_config(struct pcmcia_device *link);
ok
-> =20
-> =20
+>
+>
> static void serial_remove(struct pcmcia_device *link)
-> @@ -309,7 +309,7 @@ static int serial_probe(struct pcmcia_device *lin=
-k)
+> @@ -309,7 +309,7 @@ static int serial_probe(struct pcmcia_device *link)
> dev_dbg(&link->dev, "serial_attach()\n");
-> =20
+>
> /* Create new serial device */
-> - info =3D kzalloc(sizeof (*info), GFP_KERNEL);
-> + info =3D kzalloc(sizeof(*info), GFP_KERNEL);
+> - info = kzalloc(sizeof (*info), GFP_KERNEL);
+> + info = kzalloc(sizeof(*info), GFP_KERNEL);
ok
> if (!info)
> return -ENOMEM;
-> info->p_dev =3D link;
-> @@ -339,7 +339,7 @@ static void serial_detach(struct pcmcia_device *l=
-ink)
-> =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*/
-> =20
-> -static int setup_serial(struct pcmcia_device *handle, struct serial_=
-info * info,
-> +static int setup_serial(struct pcmcia_device *handle, struct serial_=
-info *info,
+> info->p_dev = link;
+> @@ -339,7 +339,7 @@ static void serial_detach(struct pcmcia_device *link)
+>
+> /*====================================================================*/
+>
+> -static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
+> +static int setup_serial(struct pcmcia_device *handle, struct serial_info *info,
ok
> unsigned int iobase, int irq)
> {
> struct uart_8250_port uart;
-> @@ -600,7 +600,7 @@ static int serial_check_for_multi(struct pcmcia_d=
-evice *p_dev, void *priv_data)
+> @@ -600,7 +600,7 @@ static int serial_check_for_multi(struct pcmcia_device *p_dev, void *priv_data)
> }
-> =20
-> =20
+>
+>
> -static int serial_config(struct pcmcia_device * link)
> +static int serial_config(struct pcmcia_device *link)
ok
> {
-> struct serial_info *info =3D link->priv;
+> struct serial_info *info = link->priv;
> int i;
-> @@ -701,7 +701,7 @@ static const struct pcmcia_device_id serial_ids[]=
- =3D {
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0=
-x7a821b58),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0x=
-f510db04, 0x52d21e1e),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0=
-xb2ced065, 0x3ced0555),
-> - PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x8=
-31b1064),
-> + PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x8=
-31b1064),
+> @@ -701,7 +701,7 @@ static const struct pcmcia_device_id serial_ids[] = {
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
+> - PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
+> + PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x831b1064),
ok
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamon=
-ds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts=
- Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, =
-0xcd8906cc),
-> @@ -797,30 +797,30 @@ static const struct pcmcia_device_id serial_ids=
-[] =3D {
-> PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x=
-96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
-> PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.=
-cis"),
-> PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis")=
-,
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL100",0x19ca78af,0x71d98e83),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL232 1.00.",0x19ca78af,0x69fb7490),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL232",0x19ca78af,0xb6bc0235),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL =
-CARD: CF232",0x63f2e0bd,0xb9e175d3),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL =
-CARD: CF232-5",0x63f2e0bd,0xfce33442),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x17=
-1e7190),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x=
-20da4262),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea=
-5dd57d),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd7=
-7255fa),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a=
-709903),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18=
-430676),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f=
-933767),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf=
-2,0x16dc1ba7),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf=
-2,0x19816c41),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf=
-2,0x64112029),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",=
-0x3beb8cf2,0xdb9e58bc),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf=
-2,0x16dc1ba7),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf=
-2,0x19816c41),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf=
-2,0x64112029),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL100 1.00.", 0x19ca78af, 0xf964f42b),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL100", 0x19ca78af, 0x71d98e83),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL232", 0x19ca78af, 0xb6bc0235),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL=
- CARD: CF232", 0x63f2e0bd, 0xb9e175d3),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL=
- CARD: CF232-5", 0x63f2e0bd, 0xfce33442),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0=
-x171e7190),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2,=
- 0x20da4262),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0=
-xea5dd57d),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0=
-xd77255fa),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0=
-x6a709903),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0=
-x18430676),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0=
-x6f933767),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb=
-8cf2, 0x16dc1ba7),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb=
-8cf2, 0x19816c41),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb=
-8cf2, 0x64112029),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230=
-", 0x3beb8cf2, 0xdb9e58bc),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb=
-8cf2, 0x16dc1ba7),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb=
-8cf2, 0x19816c41),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb=
-8cf2, 0x64112029),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
+> @@ -797,30 +797,30 @@ static const struct pcmcia_device_id serial_ids[] = {
+> PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
+> PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
+> PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232 1.00.",0x19ca78af,0x69fb7490),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100 1.00.", 0x19ca78af, 0xf964f42b),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100", 0x19ca78af, 0x71d98e83),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232", 0x19ca78af, 0xb6bc0235),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232", 0x63f2e0bd, 0xb9e175d3),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232-5", 0x63f2e0bd, 0xfce33442),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0x171e7190),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2, 0x20da4262),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0xea5dd57d),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0xd77255fa),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0x6a709903),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0x18430676),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0x6f933767),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230", 0x3beb8cf2, 0xdb9e58bc),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
> PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),
> /* too generic */
> /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
-ok
-
-
---
-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
\ No newline at end of file
+ok
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 860c2fb..a03e173 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -39,7 +39,7 @@
" 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"
]
[
"\0000:1\0"
@@ -57,7 +57,7 @@
"\n",
"Comments below.\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",
@@ -72,182 +72,168 @@
"> drivers/tty/serial/8250/8250_hub6.c | 2 +-\n",
"> drivers/tty/serial/8250/8250_pci.c | 7 +++-\n",
"> drivers/tty/serial/8250/8250_port.c | 3 ++\n",
- "> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++----=\n",
- "----------\n",
+ "> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++--------------\n",
"> 12 files changed, 52 insertions(+), 36 deletions(-)\n",
- ">=20\n",
- "> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/seri=\n",
- "al/8250/8250_accent.c\n",
+ "> \n",
+ "> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c\n",
"> index 34b51c6..c480729 100644\n",
"> --- a/drivers/tty/serial/8250/8250_accent.c\n",
"> +++ b/drivers/tty/serial/8250/8250_accent.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/seria=\n",
- "l/8250/8250_acorn.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c\n",
"> index 549aa07..402dfdd 100644\n",
"> --- a/drivers/tty/serial/8250/8250_acorn.c\n",
"> +++ b/drivers/tty/serial/8250/8250_acorn.c\n",
- "> \@\@ -70,7 +70,7 \@\@ serial_card_probe(struct expansion_card *ec, const =\n",
- "struct ecard_id *id)\n",
- "> \tuart.port.regshift\t=3D 2;\n",
- "> \tuart.port.dev\t=3D &ec->dev;\n",
- "> =20\n",
- "> -\tfor (i =3D 0; i < info->num_ports; i ++) {\n",
- "> +\tfor (i =3D 0; i < info->num_ports; i++) {\n",
+ "> \@\@ -70,7 +70,7 \@\@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)\n",
+ "> \tuart.port.regshift\t= 2;\n",
+ "> \tuart.port.dev\t= &ec->dev;\n",
+ "> \n",
+ "> -\tfor (i = 0; i < info->num_ports; i ++) {\n",
+ "> +\tfor (i = 0; i < info->num_ports; i++) {\n",
"\n",
"Ok\n",
"\n",
- "> \t\tuart.port.membase =3D info->vaddr + type->offset[i];\n",
- "> \t\tuart.port.mapbase =3D bus_addr + type->offset[i];\n",
- "> =20\n",
- "> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial=\n",
- "/8250/8250_boca.c\n",
+ "> \t\tuart.port.membase = info->vaddr + type->offset[i];\n",
+ "> \t\tuart.port.mapbase = bus_addr + type->offset[i];\n",
+ "> \n",
+ "> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c\n",
"> index d125dc1..e42a5b5 100644\n",
"> --- a/drivers/tty/serial/8250/8250_boca.c\n",
"> +++ b/drivers/tty/serial/8250/8250_boca.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=\n",
- "/8250/8250_core.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c\n",
"> index 3912646..89a20c9 100644\n",
"> --- a/drivers/tty/serial/8250/8250_core.c\n",
"> +++ b/drivers/tty/serial/8250/8250_core.c\n",
"> \@\@ -756,6 +756,7 \@\@ void serial8250_suspend_port(int line)\n",
"> \tif (!console_suspend_enabled && uart_console(port) &&\n",
- "> \t port->type !=3D PORT_8250) {\n",
- "> \t\tunsigned char canary =3D 0xa5;\n",
+ "> \t port->type != PORT_8250) {\n",
+ "> \t\tunsigned char canary = 0xa5;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\tserial_out(up, UART_SCR, canary);\n",
- "> \t\tif (serial_in(up, UART_SCR) =3D=3D canary)\n",
- "> \t\t\tup->canary =3D canary;\n",
- "> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8=\n",
- "250/8250_dw.c\n",
+ "> \t\tif (serial_in(up, UART_SCR) == canary)\n",
+ "> \t\t\tup->canary = canary;\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c\n",
"> index a5d319e..0f67355 100644\n",
"> --- a/drivers/tty/serial/8250/8250_dw.c\n",
"> +++ b/drivers/tty/serial/8250/8250_dw.c\n",
- "> \@\@ -102,8 +102,10 \@\@ static void dw8250_serial_out(struct uart_port *=\n",
- "p, int offset, int value)\n",
+ "> \@\@ -102,8 +102,10 \@\@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> \@\@ -143,8 +145,10 \@\@ static void dw8250_serial_outq(struct uart_port =\n",
- "*p, int offset, int value)\n",
+ "> \@\@ -143,8 +145,10 \@\@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"In particular, I dislike separation between initialized variables and\n",
- "following statements, _especially_ when the initialization is non-trivi=\n",
- "al.\n",
+ "following statements, _especially_ when the initialization is non-trivial.\n",
"\n",
"\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> \@\@ -166,8 +170,10 \@\@ static void dw8250_serial_out32(struct uart_port=\n",
- " *p, int offset, int value)\n",
+ "> \@\@ -166,8 +170,10 \@\@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/t=\n",
- "ty/serial/8250/8250_exar_st16c554.c\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> index bf53aab..999f2d3 100644\n",
"> --- a/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> \@\@ -13,7 +13,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/se=\n",
- "rial/8250/8250_fourport.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c\n",
"> index be15826..9a04a8a 100644\n",
"> --- a/drivers/tty/serial/8250/8250_fourport.c\n",
"> +++ b/drivers/tty/serial/8250/8250_fourport.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=\n",
- "l/8250/8250_hp300.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c\n",
"> index 2891958..38d8cb2 100644\n",
"> --- a/drivers/tty/serial/8250/8250_hp300.c\n",
"> +++ b/drivers/tty/serial/8250/8250_hp300.c\n",
"> \@\@ -125,6 +125,7 \@\@ int __init hp300_setup_serial_console(void)\n",
"> \t} else {\n",
"> #ifdef CONFIG_HPDCA\n",
- "> \t\tunsigned long pa =3D dio_scodetophysaddr(scode);\n",
+ "> \t\tunsigned long pa = dio_scodetophysaddr(scode);\n",
"> +\n",
"> \t\tif (!pa)\n",
"> \t\t\treturn 0;\n",
@@ -255,71 +241,64 @@
"Not ok.\n",
"\n",
"This is a particularly good example of how bad that style is.\n",
- "The relevant code is the call to dio_scode_tophysaddr() _not the if (!p=\n",
- "a)_\n",
+ "The relevant code is the call to dio_scode_tophysaddr() _not the if (!pa)_\n",
"\n",
"Newline after uninitialized vars - ok.\n",
- "Newline after initialized vars - not ok. Unless trivial initialization =\n",
- "and\n",
+ "Newline after initialized vars - not ok. Unless trivial initialization and\n",
"you wrote it.\n",
"\n",
"\n",
- "> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial=\n",
- "/8250/8250_hub6.c\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c\n",
"> index a5c778e..27124e2 100644\n",
"> --- a/drivers/tty/serial/8250/8250_hub6.c\n",
"> +++ b/drivers/tty/serial/8250/8250_hub6.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define HUB6(card,port)\t\t\t\t\t\t\t\\\n",
"> +#define HUB6(card, port)\t\t\t\t\t\t\\\n",
"\n",
"ok\n",
"\n",
"> \t{\t\t\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D 0x302,\t\t\t\t\\\n",
- "> \t\t.irq\t\t=3D 3,\t\t\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n",
- "8250/8250_pci.c\n",
+ "> \t\t.iobase\t\t= 0x302,\t\t\t\t\\\n",
+ "> \t\t.irq\t\t= 3,\t\t\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n",
"> index 4097f3f..ed99fdf 100644\n",
"> --- a/drivers/tty/serial/8250/8250_pci.c\n",
"> +++ b/drivers/tty/serial/8250/8250_pci.c\n",
- "> \@\@ -113,6 +113,7 \@\@ static int addidata_apci7800_setup(struct serial_=\n",
- "private *priv,\n",
+ "> \@\@ -113,6 +113,7 \@\@ static int addidata_apci7800_setup(struct serial_private *priv,\n",
"> \t\t\t\tstruct uart_8250_port *port, int idx)\n",
"> {\n",
- "> \tunsigned int bar =3D 0, offset =3D board->first_offset;\n",
+ "> \tunsigned int bar = 0, offset = board->first_offset;\n",
"> +\n",
"\n",
"not ok\n",
"\n",
- "> \tbar =3D FL_GET_BASE(board->flags);\n",
- "> =20\n",
+ "> \tbar = FL_GET_BASE(board->flags);\n",
+ "> \n",
"> \tif (idx < 2) {\n",
- "> \@\@ -1115,6 +1116,7 \@\@ static struct quatech_feature quatech_cards[] =3D=\n",
- " {\n",
+ "> \@\@ -1115,6 +1116,7 \@\@ static struct quatech_feature quatech_cards[] = {\n",
"> static int pci_quatech_amcc(u16 devid)\n",
"> {\n",
- "> \tstruct quatech_feature *qf =3D &quatech_cards[0];\n",
+ "> \tstruct quatech_feature *qf = &quatech_cards[0];\n",
"> +\n",
"\n",
"not ok\n",
"\n",
"> \twhile (qf->devid) {\n",
- "> \t\tif (qf->devid =3D=3D devid)\n",
+ "> \t\tif (qf->devid == devid)\n",
"> \t\t\treturn qf->amcc;\n",
- "> \@\@ -1200,6 +1202,7 \@\@ static int pci_quatech_test(struct uart_8250_po=\n",
- "rt *port)\n",
+ "> \@\@ -1200,6 +1202,7 \@\@ static int pci_quatech_test(struct uart_8250_port *port)\n",
"> {\n",
"> \tu8 reg;\n",
- "> \tu8 qopr =3D pci_quatech_rqopr(port);\n",
+ "> \tu8 qopr = pci_quatech_rqopr(port);\n",
"> +\n",
"\n",
"Swap the declaration order and its ok. IOW,\n",
"\n",
- "+ \tu8 qopr =3D pci_quatech_rqopr(port);\n",
+ "+ \tu8 qopr = pci_quatech_rqopr(port);\n",
"+ \tu8 reg;\n",
"+\n",
"\n",
@@ -327,16 +306,15 @@
"\n",
"+ \tu8 reg, qopr;\n",
"+\n",
- "+ \tqopr =3D pci_quatech_rqopr(port);\n",
+ "+ \tqopr = pci_quatech_rqopr(port);\n",
"\n",
"> \tpci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);\n",
- "> \treg =3D pci_quatech_rqopr(port) & 0xC0;\n",
- "> \tif (reg !=3D QPCR_TEST_GET1)\n",
- "> \@\@ -1284,8 +1287,10 \@\@ static int pci_quatech_init(struct pci_dev *de=\n",
- "v)\n",
+ "> \treg = pci_quatech_rqopr(port) & 0xC0;\n",
+ "> \tif (reg != QPCR_TEST_GET1)\n",
+ "> \@\@ -1284,8 +1287,10 \@\@ static int pci_quatech_init(struct pci_dev *dev)\n",
"> {\n",
"> \tif (pci_quatech_amcc(dev->device)) {\n",
- "> \t\tunsigned long base =3D pci_resource_start(dev, 0);\n",
+ "> \t\tunsigned long base = pci_resource_start(dev, 0);\n",
"> +\n",
"\n",
"not ok\n",
@@ -349,10 +327,9 @@
"ok\n",
"\n",
"> \t\t\toutl(inl(base + 0x38) | 0x00002000, base + 0x38);\n",
- "> \t\t\ttmp =3D inl(base + 0x3c);\n",
+ "> \t\t\ttmp = inl(base + 0x3c);\n",
"> \t\t\toutl(tmp | 0x01000000, base + 0x3c);\n",
- "> \@\@ -4502,7 +4507,7 \@\@ static struct pci_device_id serial_pci_tbl[] =3D=\n",
- " {\n",
+ "> \@\@ -4502,7 +4507,7 \@\@ static struct pci_device_id serial_pci_tbl[] = {\n",
"> \t\tPCI_ANY_ID, PCI_ANY_ID, 0, 0,\n",
"> \t\tpbn_b0_bt_2_921600 },\n",
"> \t{\tPCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,\n",
@@ -362,27 +339,24 @@
"ok\n",
"\n",
"> \t\tpbn_b2_8_1152000 },\n",
- "> =20\n",
+ "> \n",
"> \t/*\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 52d82d2..ae8f993 100644\n",
"> --- a/drivers/tty/serial/8250/8250_port.c\n",
"> +++ b/drivers/tty/serial/8250/8250_port.c\n",
- "> \@\@ -1327,6 +1327,7 \@\@ static void serial8250_start_tx(struct uart_por=\n",
- "t *port)\n",
- "> =20\n",
+ "> \@\@ -1327,6 +1327,7 \@\@ static void serial8250_start_tx(struct uart_port *port)\n",
+ "> \n",
"> \t\tif (up->bugs & UART_BUG_TXEN) {\n",
"> \t\t\tunsigned char lsr;\n",
"> +\n",
"\n",
"ok\n",
"\n",
- "> \t\t\tlsr =3D serial_in(up, UART_LSR);\n",
- "> \t\t\tup->lsr_saved_flags |=3D lsr & LSR_SAVE_FLAGS;\n",
+ "> \t\t\tlsr = serial_in(up, UART_LSR);\n",
+ "> \t\t\tup->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;\n",
"> \t\t\tif (lsr & UART_LSR_THRE)\n",
- "> \@\@ -1734,8 +1735,10 \@\@ static void wait_for_xmitr(struct uart_8250_po=\n",
- "rt *up, int bits)\n",
+ "> \@\@ -1734,8 +1735,10 \@\@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)\n",
"> \t/* Wait up to 1s for flow control if necessary */\n",
"> \tif (up->port.flags & UPF_CONS_FLOW) {\n",
"> \t\tunsigned int tmout;\n",
@@ -390,213 +364,137 @@
"\n",
"ok\n",
"\n",
- "> \t\tfor (tmout =3D 1000000; tmout; tmout--) {\n",
- "> \t\t\tunsigned int msr =3D serial_in(up, UART_MSR);\n",
+ "> \t\tfor (tmout = 1000000; tmout; tmout--) {\n",
+ "> \t\t\tunsigned int msr = serial_in(up, UART_MSR);\n",
"> +\n",
"\n",
"not ok\n",
"\n",
- "> \t\t\tup->msr_saved_flags |=3D msr & MSR_SAVE_FLAGS;\n",
+ "> \t\t\tup->msr_saved_flags |= msr & MSR_SAVE_FLAGS;\n",
"> \t\t\tif (msr & UART_MSR_CTS)\n",
"> \t\t\t\tbreak;\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 4d180c9..f5270ba 100644\n",
"> --- a/drivers/tty/serial/8250/serial_cs.c\n",
"> +++ b/drivers/tty/serial/8250/serial_cs.c\n",
- "> \@\@ -257,7 +257,7 \@\@ static const struct serial_quirk quirks[] =3D {\n",
+ "> \@\@ -257,7 +257,7 \@\@ static const struct serial_quirk quirks[] = {\n",
"> };\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> -static int serial_config(struct pcmcia_device * link);\n",
"> +static int serial_config(struct pcmcia_device *link);\n",
"\n",
"ok\n",
"\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> static void serial_remove(struct pcmcia_device *link)\n",
- "> \@\@ -309,7 +309,7 \@\@ static int serial_probe(struct pcmcia_device *lin=\n",
- "k)\n",
+ "> \@\@ -309,7 +309,7 \@\@ static int serial_probe(struct pcmcia_device *link)\n",
"> \tdev_dbg(&link->dev, \"serial_attach()\\n\");\n",
- "> =20\n",
+ "> \n",
"> \t/* Create new serial device */\n",
- "> -\tinfo =3D kzalloc(sizeof (*info), GFP_KERNEL);\n",
- "> +\tinfo =3D kzalloc(sizeof(*info), GFP_KERNEL);\n",
+ "> -\tinfo = kzalloc(sizeof (*info), GFP_KERNEL);\n",
+ "> +\tinfo = kzalloc(sizeof(*info), GFP_KERNEL);\n",
"\n",
"ok\n",
"\n",
"> \tif (!info)\n",
"> \t\treturn -ENOMEM;\n",
- "> \tinfo->p_dev =3D link;\n",
- "> \@\@ -339,7 +339,7 \@\@ static void serial_detach(struct pcmcia_device *l=\n",
- "ink)\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=\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",
- "> =20\n",
- "> -static int setup_serial(struct pcmcia_device *handle, struct serial_=\n",
- "info * info,\n",
- "> +static int setup_serial(struct pcmcia_device *handle, struct serial_=\n",
- "info *info,\n",
+ "> \tinfo->p_dev = link;\n",
+ "> \@\@ -339,7 +339,7 \@\@ static void serial_detach(struct pcmcia_device *link)\n",
+ "> \n",
+ "> /*====================================================================*/\n",
+ "> \n",
+ "> -static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,\n",
+ "> +static int setup_serial(struct pcmcia_device *handle, struct serial_info *info,\n",
"\n",
"ok\n",
"\n",
"> \t\t\tunsigned int iobase, int irq)\n",
"> {\n",
"> \tstruct uart_8250_port uart;\n",
- "> \@\@ -600,7 +600,7 \@\@ static int serial_check_for_multi(struct pcmcia_d=\n",
- "evice *p_dev, void *priv_data)\n",
+ "> \@\@ -600,7 +600,7 \@\@ static int serial_check_for_multi(struct pcmcia_device *p_dev, void *priv_data)\n",
"> }\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> -static int serial_config(struct pcmcia_device * link)\n",
"> +static int serial_config(struct pcmcia_device *link)\n",
"\n",
"ok\n",
"\n",
"> {\n",
- "> \tstruct serial_info *info =3D link->priv;\n",
+ "> \tstruct serial_info *info = link->priv;\n",
"> \tint i;\n",
- "> \@\@ -701,7 +701,7 \@\@ static const struct pcmcia_device_id serial_ids[]=\n",
- " =3D {\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"LINKSYS\", \"PCMLM336\", 0xf7cb0b07, 0=\n",
- "x7a821b58),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MEGAHERTZ\", \"XJEM1144/CCEM1144\", 0x=\n",
- "f510db04, 0x52d21e1e),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MICRO RESEARCH\", \"COMBO-L/M-336\", 0=\n",
- "xb2ced065, 0x3ced0555),\n",
- "> -\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\" ,0x18df0ba0 ,0x8=\n",
- "31b1064),\n",
- "> +\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\", 0x18df0ba0, 0x8=\n",
- "31b1064),\n",
+ "> \@\@ -701,7 +701,7 \@\@ static const struct pcmcia_device_id serial_ids[] = {\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"LINKSYS\", \"PCMLM336\", 0xf7cb0b07, 0x7a821b58),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MEGAHERTZ\", \"XJEM1144/CCEM1144\", 0xf510db04, 0x52d21e1e),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MICRO RESEARCH\", \"COMBO-L/M-336\", 0xb2ced065, 0x3ced0555),\n",
+ "> -\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\" ,0x18df0ba0 ,0x831b1064),\n",
+ "> +\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\", 0x18df0ba0, 0x831b1064),\n",
"\n",
"ok\n",
"\n",
"\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Diamon=\n",
- "ds Modem+Ethernet\", 0xc2f80cd, 0x656947b9),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Hearts=\n",
- " Modem+Ethernet\", 0xc2f80cd, 0xdc9ba5ed),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"PCMCIAs\", \"ComboCard\", 0xdcfe12d3, =\n",
- "0xcd8906cc),\n",
- "> \@\@ -797,30 +797,30 \@\@ static const struct pcmcia_device_id serial_ids=\n",
- "[] =3D {\n",
- "> \tPCMCIA_DEVICE_CIS_PROD_ID123(\"ADVANTECH\", \"COMpad-32/85\", \"1.0\", 0x=\n",
- "96913a85, 0x8fbe92ae, 0x0877b627, \"cis/COMpad2.cis\"),\n",
- "> \tPCMCIA_DEVICE_CIS_PROD_ID2(\"RS-COM 2P\", 0xad20b156, \"cis/RS-COM-2P.=\n",
- "cis\"),\n",
- "> \tPCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, \"cis/GLOBETROTTER.cis\")=\n",
- ",\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL100 1.00.\",0x19ca78af,0xf964f42b),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL100\",0x19ca78af,0x71d98e83),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL232 1.00.\",0x19ca78af,0x69fb7490),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL232\",0x19ca78af,0xb6bc0235),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL =\n",
- "CARD: CF232\",0x63f2e0bd,0xb9e175d3),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL =\n",
- "CARD: CF232-5\",0x63f2e0bd,0xfce33442),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232\",0x3beb8cf2,0x17=\n",
- "1e7190),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232-5\",0x3beb8cf2,0x=\n",
- "20da4262),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF428\",0x3beb8cf2,0xea=\n",
- "5dd57d),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF500\",0x3beb8cf2,0xd7=\n",
- "7255fa),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: IC232\",0x3beb8cf2,0x6a=\n",
- "709903),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: SL232\",0x3beb8cf2,0x18=\n",
- "430676),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: XL232\",0x3beb8cf2,0x6f=\n",
- "933767),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: CF332\",0x3beb8cf=\n",
- "2,0x16dc1ba7),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL332\",0x3beb8cf=\n",
- "2,0x19816c41),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL385\",0x3beb8cf=\n",
- "2,0x64112029),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial+Parallel Port: SP230\",=\n",
- "0x3beb8cf2,0xdb9e58bc),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: CF332\",0x3beb8cf=\n",
- "2,0x16dc1ba7),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL332\",0x3beb8cf=\n",
- "2,0x19816c41),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL385\",0x3beb8cf=\n",
- "2,0x64112029),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(2,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(3,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL100 1.00.\", 0x19ca78af, 0xf964f42b),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL100\", 0x19ca78af, 0x71d98e83),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL232 1.00.\", 0x19ca78af, 0x69fb7490),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL232\", 0x19ca78af, 0xb6bc0235),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL=\n",
- " CARD: CF232\", 0x63f2e0bd, 0xb9e175d3),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL=\n",
- " CARD: CF232-5\", 0x63f2e0bd, 0xfce33442),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232\", 0x3beb8cf2, 0=\n",
- "x171e7190),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232-5\", 0x3beb8cf2,=\n",
- " 0x20da4262),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF428\", 0x3beb8cf2, 0=\n",
- "xea5dd57d),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF500\", 0x3beb8cf2, 0=\n",
- "xd77255fa),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: IC232\", 0x3beb8cf2, 0=\n",
- "x6a709903),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: SL232\", 0x3beb8cf2, 0=\n",
- "x18430676),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: XL232\", 0x3beb8cf2, 0=\n",
- "x6f933767),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: CF332\", 0x3beb=\n",
- "8cf2, 0x16dc1ba7),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL332\", 0x3beb=\n",
- "8cf2, 0x19816c41),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL385\", 0x3beb=\n",
- "8cf2, 0x64112029),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial+Parallel Port: SP230=\n",
- "\", 0x3beb8cf2, 0xdb9e58bc),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: CF332\", 0x3beb=\n",
- "8cf2, 0x16dc1ba7),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL332\", 0x3beb=\n",
- "8cf2, 0x19816c41),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL385\", 0x3beb=\n",
- "8cf2, 0x64112029),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(2, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(3, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Diamonds Modem+Ethernet\", 0xc2f80cd, 0x656947b9),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Hearts Modem+Ethernet\", 0xc2f80cd, 0xdc9ba5ed),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"PCMCIAs\", \"ComboCard\", 0xdcfe12d3, 0xcd8906cc),\n",
+ "> \@\@ -797,30 +797,30 \@\@ static const struct pcmcia_device_id serial_ids[] = {\n",
+ "> \tPCMCIA_DEVICE_CIS_PROD_ID123(\"ADVANTECH\", \"COMpad-32/85\", \"1.0\", 0x96913a85, 0x8fbe92ae, 0x0877b627, \"cis/COMpad2.cis\"),\n",
+ "> \tPCMCIA_DEVICE_CIS_PROD_ID2(\"RS-COM 2P\", 0xad20b156, \"cis/RS-COM-2P.cis\"),\n",
+ "> \tPCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, \"cis/GLOBETROTTER.cis\"),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL100 1.00.\",0x19ca78af,0xf964f42b),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL100\",0x19ca78af,0x71d98e83),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL232 1.00.\",0x19ca78af,0x69fb7490),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL232\",0x19ca78af,0xb6bc0235),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL CARD: CF232\",0x63f2e0bd,0xb9e175d3),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL CARD: CF232-5\",0x63f2e0bd,0xfce33442),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232\",0x3beb8cf2,0x171e7190),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232-5\",0x3beb8cf2,0x20da4262),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF428\",0x3beb8cf2,0xea5dd57d),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF500\",0x3beb8cf2,0xd77255fa),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: IC232\",0x3beb8cf2,0x6a709903),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: SL232\",0x3beb8cf2,0x18430676),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: XL232\",0x3beb8cf2,0x6f933767),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: CF332\",0x3beb8cf2,0x16dc1ba7),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL332\",0x3beb8cf2,0x19816c41),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL385\",0x3beb8cf2,0x64112029),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial+Parallel Port: SP230\",0x3beb8cf2,0xdb9e58bc),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: CF332\",0x3beb8cf2,0x16dc1ba7),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL332\",0x3beb8cf2,0x19816c41),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL385\",0x3beb8cf2,0x64112029),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(2,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(3,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL100 1.00.\", 0x19ca78af, 0xf964f42b),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL100\", 0x19ca78af, 0x71d98e83),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL232 1.00.\", 0x19ca78af, 0x69fb7490),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL232\", 0x19ca78af, 0xb6bc0235),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL CARD: CF232\", 0x63f2e0bd, 0xb9e175d3),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL CARD: CF232-5\", 0x63f2e0bd, 0xfce33442),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232\", 0x3beb8cf2, 0x171e7190),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232-5\", 0x3beb8cf2, 0x20da4262),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF428\", 0x3beb8cf2, 0xea5dd57d),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF500\", 0x3beb8cf2, 0xd77255fa),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: IC232\", 0x3beb8cf2, 0x6a709903),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: SL232\", 0x3beb8cf2, 0x18430676),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: XL232\", 0x3beb8cf2, 0x6f933767),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: CF332\", 0x3beb8cf2, 0x16dc1ba7),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL332\", 0x3beb8cf2, 0x19816c41),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL385\", 0x3beb8cf2, 0x64112029),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial+Parallel Port: SP230\", 0x3beb8cf2, 0xdb9e58bc),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: CF332\", 0x3beb8cf2, 0x16dc1ba7),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL332\", 0x3beb8cf2, 0x19816c41),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL385\", 0x3beb8cf2, 0x64112029),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(2, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(3, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
"> \tPCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),\n",
"> \t/* too generic */\n",
"> \t/* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */\n",
"\n",
- "ok\n",
- "\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"
+ "ok"
]
-50808c9ab79c873a6031dc929143f3d005aebe64baa8a6a3caff73004a14322e
+fbf033b7d50b6baf3b42337d04651b8140d0b78abe2ff80ab2ad4521219532b4
diff --git a/a/1.txt b/N2/1.txt
index 4432fff..f44da4e 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -7,7 +7,7 @@ On 12/16/2015 07:36 AM, Anton Wuerfel wrote:
Comments below.
-> 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
> ---
@@ -22,182 +22,168 @@ Comments below.
> drivers/tty/serial/8250/8250_hub6.c | 2 +-
> drivers/tty/serial/8250/8250_pci.c | 7 +++-
> drivers/tty/serial/8250/8250_port.c | 3 ++
-> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++----=
-----------
+> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++--------------
> 12 files changed, 52 insertions(+), 36 deletions(-)
->=20
-> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/seri=
-al/8250/8250_accent.c
+>
+> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c
> index 34b51c6..c480729 100644
> --- a/drivers/tty/serial/8250/8250_accent.c
> +++ b/drivers/tty/serial/8250/8250_accent.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/seria=
-l/8250/8250_acorn.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c
> index 549aa07..402dfdd 100644
> --- a/drivers/tty/serial/8250/8250_acorn.c
> +++ b/drivers/tty/serial/8250/8250_acorn.c
-> @@ -70,7 +70,7 @@ serial_card_probe(struct expansion_card *ec, const =
-struct ecard_id *id)
-> uart.port.regshift =3D 2;
-> uart.port.dev =3D &ec->dev;
-> =20
-> - for (i =3D 0; i < info->num_ports; i ++) {
-> + for (i =3D 0; i < info->num_ports; i++) {
+> @@ -70,7 +70,7 @@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)
+> uart.port.regshift = 2;
+> uart.port.dev = &ec->dev;
+>
+> - for (i = 0; i < info->num_ports; i ++) {
+> + for (i = 0; i < info->num_ports; i++) {
Ok
-> uart.port.membase =3D info->vaddr + type->offset[i];
-> uart.port.mapbase =3D bus_addr + type->offset[i];
-> =20
-> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial=
-/8250/8250_boca.c
+> uart.port.membase = info->vaddr + type->offset[i];
+> uart.port.mapbase = bus_addr + type->offset[i];
+>
+> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c
> index d125dc1..e42a5b5 100644
> --- a/drivers/tty/serial/8250/8250_boca.c
> +++ b/drivers/tty/serial/8250/8250_boca.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=
-/8250/8250_core.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 3912646..89a20c9 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -756,6 +756,7 @@ void serial8250_suspend_port(int line)
> if (!console_suspend_enabled && uart_console(port) &&
-> port->type !=3D PORT_8250) {
-> unsigned char canary =3D 0xa5;
+> port->type != PORT_8250) {
+> unsigned char canary = 0xa5;
> +
Not ok.
> serial_out(up, UART_SCR, canary);
-> if (serial_in(up, UART_SCR) =3D=3D canary)
-> up->canary =3D canary;
-> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8=
-250/8250_dw.c
+> if (serial_in(up, UART_SCR) == canary)
+> up->canary = canary;
+> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
> index a5d319e..0f67355 100644
> --- a/drivers/tty/serial/8250/8250_dw.c
> +++ b/drivers/tty/serial/8250/8250_dw.c
-> @@ -102,8 +102,10 @@ static void dw8250_serial_out(struct uart_port *=
-p, int offset, int value)
+> @@ -102,8 +102,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> @@ -143,8 +145,10 @@ static void dw8250_serial_outq(struct uart_port =
-*p, int offset, int value)
+> @@ -143,8 +145,10 @@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
Not ok.
In particular, I dislike separation between initialized variables and
-following statements, _especially_ when the initialization is non-trivi=
-al.
+following statements, _especially_ when the initialization is non-trivial.
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> @@ -166,8 +170,10 @@ static void dw8250_serial_out32(struct uart_port=
- *p, int offset, int value)
+> @@ -166,8 +170,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
> /* Make sure LCR write wasn't ignored */
-> if (offset =3D=3D UART_LCR) {
-> int tries =3D 1000;
+> if (offset == UART_LCR) {
+> int tries = 1000;
> +
Not ok.
> while (tries--) {
-> unsigned int lcr =3D p->serial_in(p, UART_LCR);
+> unsigned int lcr = p->serial_in(p, UART_LCR);
> +
Not ok.
-> if ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))
+> if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
> return;
> dw8250_force_idle(p);
-> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/t=
-ty/serial/8250/8250_exar_st16c554.c
+> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c
> index bf53aab..999f2d3 100644
> --- a/drivers/tty/serial/8250/8250_exar_st16c554.c
> +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c
> @@ -13,7 +13,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/se=
-rial/8250/8250_fourport.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c
> index be15826..9a04a8a 100644
> --- a/drivers/tty/serial/8250/8250_fourport.c
> +++ b/drivers/tty/serial/8250/8250_fourport.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define PORT(_base,_irq) \
> +#define PORT(_base, _irq) \
Ok
> { \
-> .iobase =3D _base, \
-> .irq =3D _irq, \
-> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=
-l/8250/8250_hp300.c
+> .iobase = _base, \
+> .irq = _irq, \
+> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
> index 2891958..38d8cb2 100644
> --- a/drivers/tty/serial/8250/8250_hp300.c
> +++ b/drivers/tty/serial/8250/8250_hp300.c
> @@ -125,6 +125,7 @@ int __init hp300_setup_serial_console(void)
> } else {
> #ifdef CONFIG_HPDCA
-> unsigned long pa =3D dio_scodetophysaddr(scode);
+> unsigned long pa = dio_scodetophysaddr(scode);
> +
> if (!pa)
> return 0;
@@ -205,71 +191,64 @@ l/8250/8250_hp300.c
Not ok.
This is a particularly good example of how bad that style is.
-The relevant code is the call to dio_scode_tophysaddr() _not the if (!p=
-a)_
+The relevant code is the call to dio_scode_tophysaddr() _not the if (!pa)_
Newline after uninitialized vars - ok.
-Newline after initialized vars - not ok. Unless trivial initialization =
-and
+Newline after initialized vars - not ok. Unless trivial initialization and
you wrote it.
-> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial=
-/8250/8250_hub6.c
+> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c
> index a5c778e..27124e2 100644
> --- a/drivers/tty/serial/8250/8250_hub6.c
> +++ b/drivers/tty/serial/8250/8250_hub6.c
> @@ -10,7 +10,7 @@
> #include <linux/init.h>
> #include <linux/serial_8250.h>
-> =20
+>
> -#define HUB6(card,port) \
> +#define HUB6(card, port) \
ok
> { \
-> .iobase =3D 0x302, \
-> .irq =3D 3, \
-> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=
-8250/8250_pci.c
+> .iobase = 0x302, \
+> .irq = 3, \
+> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
> index 4097f3f..ed99fdf 100644
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
-> @@ -113,6 +113,7 @@ static int addidata_apci7800_setup(struct serial_=
-private *priv,
+> @@ -113,6 +113,7 @@ static int addidata_apci7800_setup(struct serial_private *priv,
> struct uart_8250_port *port, int idx)
> {
-> unsigned int bar =3D 0, offset =3D board->first_offset;
+> unsigned int bar = 0, offset = board->first_offset;
> +
not ok
-> bar =3D FL_GET_BASE(board->flags);
-> =20
+> bar = FL_GET_BASE(board->flags);
+>
> if (idx < 2) {
-> @@ -1115,6 +1116,7 @@ static struct quatech_feature quatech_cards[] =3D=
- {
+> @@ -1115,6 +1116,7 @@ static struct quatech_feature quatech_cards[] = {
> static int pci_quatech_amcc(u16 devid)
> {
-> struct quatech_feature *qf =3D &quatech_cards[0];
+> struct quatech_feature *qf = &quatech_cards[0];
> +
not ok
> while (qf->devid) {
-> if (qf->devid =3D=3D devid)
+> if (qf->devid == devid)
> return qf->amcc;
-> @@ -1200,6 +1202,7 @@ static int pci_quatech_test(struct uart_8250_po=
-rt *port)
+> @@ -1200,6 +1202,7 @@ static int pci_quatech_test(struct uart_8250_port *port)
> {
> u8 reg;
-> u8 qopr =3D pci_quatech_rqopr(port);
+> u8 qopr = pci_quatech_rqopr(port);
> +
Swap the declaration order and its ok. IOW,
-+ u8 qopr =3D pci_quatech_rqopr(port);
++ u8 qopr = pci_quatech_rqopr(port);
+ u8 reg;
+
@@ -277,16 +256,15 @@ or even better
+ u8 reg, qopr;
+
-+ qopr =3D pci_quatech_rqopr(port);
++ qopr = pci_quatech_rqopr(port);
> pci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);
-> reg =3D pci_quatech_rqopr(port) & 0xC0;
-> if (reg !=3D QPCR_TEST_GET1)
-> @@ -1284,8 +1287,10 @@ static int pci_quatech_init(struct pci_dev *de=
-v)
+> reg = pci_quatech_rqopr(port) & 0xC0;
+> if (reg != QPCR_TEST_GET1)
+> @@ -1284,8 +1287,10 @@ static int pci_quatech_init(struct pci_dev *dev)
> {
> if (pci_quatech_amcc(dev->device)) {
-> unsigned long base =3D pci_resource_start(dev, 0);
+> unsigned long base = pci_resource_start(dev, 0);
> +
not ok
@@ -299,10 +277,9 @@ not ok
ok
> outl(inl(base + 0x38) | 0x00002000, base + 0x38);
-> tmp =3D inl(base + 0x3c);
+> tmp = inl(base + 0x3c);
> outl(tmp | 0x01000000, base + 0x3c);
-> @@ -4502,7 +4507,7 @@ static struct pci_device_id serial_pci_tbl[] =3D=
- {
+> @@ -4502,7 +4507,7 @@ static struct pci_device_id serial_pci_tbl[] = {
> PCI_ANY_ID, PCI_ANY_ID, 0, 0,
> pbn_b0_bt_2_921600 },
> { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
@@ -312,27 +289,24 @@ ok
ok
> pbn_b2_8_1152000 },
-> =20
+>
> /*
-> 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 52d82d2..ae8f993 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
-> @@ -1327,6 +1327,7 @@ static void serial8250_start_tx(struct uart_por=
-t *port)
-> =20
+> @@ -1327,6 +1327,7 @@ static void serial8250_start_tx(struct uart_port *port)
+>
> if (up->bugs & UART_BUG_TXEN) {
> unsigned char lsr;
> +
ok
-> lsr =3D serial_in(up, UART_LSR);
-> up->lsr_saved_flags |=3D lsr & LSR_SAVE_FLAGS;
+> lsr = serial_in(up, UART_LSR);
+> up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
> if (lsr & UART_LSR_THRE)
-> @@ -1734,8 +1735,10 @@ static void wait_for_xmitr(struct uart_8250_po=
-rt *up, int bits)
+> @@ -1734,8 +1735,10 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
> /* Wait up to 1s for flow control if necessary */
> if (up->port.flags & UPF_CONS_FLOW) {
> unsigned int tmout;
@@ -340,201 +314,132 @@ rt *up, int bits)
ok
-> for (tmout =3D 1000000; tmout; tmout--) {
-> unsigned int msr =3D serial_in(up, UART_MSR);
+> for (tmout = 1000000; tmout; tmout--) {
+> unsigned int msr = serial_in(up, UART_MSR);
> +
not ok
-> up->msr_saved_flags |=3D msr & MSR_SAVE_FLAGS;
+> up->msr_saved_flags |= msr & MSR_SAVE_FLAGS;
> if (msr & UART_MSR_CTS)
> break;
-> 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 4d180c9..f5270ba 100644
> --- a/drivers/tty/serial/8250/serial_cs.c
> +++ b/drivers/tty/serial/8250/serial_cs.c
-> @@ -257,7 +257,7 @@ static const struct serial_quirk quirks[] =3D {
+> @@ -257,7 +257,7 @@ static const struct serial_quirk quirks[] = {
> };
-> =20
-> =20
+>
+>
> -static int serial_config(struct pcmcia_device * link);
> +static int serial_config(struct pcmcia_device *link);
ok
-> =20
-> =20
+>
+>
> static void serial_remove(struct pcmcia_device *link)
-> @@ -309,7 +309,7 @@ static int serial_probe(struct pcmcia_device *lin=
-k)
+> @@ -309,7 +309,7 @@ static int serial_probe(struct pcmcia_device *link)
> dev_dbg(&link->dev, "serial_attach()\n");
-> =20
+>
> /* Create new serial device */
-> - info =3D kzalloc(sizeof (*info), GFP_KERNEL);
-> + info =3D kzalloc(sizeof(*info), GFP_KERNEL);
+> - info = kzalloc(sizeof (*info), GFP_KERNEL);
+> + info = kzalloc(sizeof(*info), GFP_KERNEL);
ok
> if (!info)
> return -ENOMEM;
-> info->p_dev =3D link;
-> @@ -339,7 +339,7 @@ static void serial_detach(struct pcmcia_device *l=
-ink)
-> =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*/
-> =20
-> -static int setup_serial(struct pcmcia_device *handle, struct serial_=
-info * info,
-> +static int setup_serial(struct pcmcia_device *handle, struct serial_=
-info *info,
+> info->p_dev = link;
+> @@ -339,7 +339,7 @@ static void serial_detach(struct pcmcia_device *link)
+>
+> /*====================================================================*/
+>
+> -static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,
+> +static int setup_serial(struct pcmcia_device *handle, struct serial_info *info,
ok
> unsigned int iobase, int irq)
> {
> struct uart_8250_port uart;
-> @@ -600,7 +600,7 @@ static int serial_check_for_multi(struct pcmcia_d=
-evice *p_dev, void *priv_data)
+> @@ -600,7 +600,7 @@ static int serial_check_for_multi(struct pcmcia_device *p_dev, void *priv_data)
> }
-> =20
-> =20
+>
+>
> -static int serial_config(struct pcmcia_device * link)
> +static int serial_config(struct pcmcia_device *link)
ok
> {
-> struct serial_info *info =3D link->priv;
+> struct serial_info *info = link->priv;
> int i;
-> @@ -701,7 +701,7 @@ static const struct pcmcia_device_id serial_ids[]=
- =3D {
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0=
-x7a821b58),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0x=
-f510db04, 0x52d21e1e),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0=
-xb2ced065, 0x3ced0555),
-> - PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x8=
-31b1064),
-> + PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x8=
-31b1064),
+> @@ -701,7 +701,7 @@ static const struct pcmcia_device_id serial_ids[] = {
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
+> - PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
+> + PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001", 0x18df0ba0, 0x831b1064),
ok
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamon=
-ds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts=
- Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
-> PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, =
-0xcd8906cc),
-> @@ -797,30 +797,30 @@ static const struct pcmcia_device_id serial_ids=
-[] =3D {
-> PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x=
-96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
-> PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.=
-cis"),
-> PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis")=
-,
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL100",0x19ca78af,0x71d98e83),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL232 1.00.",0x19ca78af,0x69fb7490),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL =
-CARD: SL232",0x19ca78af,0xb6bc0235),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL =
-CARD: CF232",0x63f2e0bd,0xb9e175d3),
-> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL =
-CARD: CF232-5",0x63f2e0bd,0xfce33442),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x17=
-1e7190),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x=
-20da4262),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea=
-5dd57d),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd7=
-7255fa),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a=
-709903),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18=
-430676),
-> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f=
-933767),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf=
-2,0x16dc1ba7),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf=
-2,0x19816c41),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf=
-2,0x64112029),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",=
-0x3beb8cf2,0xdb9e58bc),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf=
-2,0x16dc1ba7),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf=
-2,0x19816c41),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf=
-2,0x64112029),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> - PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf=
-2,0x1cce7ac4),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL100 1.00.", 0x19ca78af, 0xf964f42b),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL100", 0x19ca78af, 0x71d98e83),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL=
- CARD: SL232", 0x19ca78af, 0xb6bc0235),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL=
- CARD: CF232", 0x63f2e0bd, 0xb9e175d3),
-> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL=
- CARD: CF232-5", 0x63f2e0bd, 0xfce33442),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0=
-x171e7190),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2,=
- 0x20da4262),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0=
-xea5dd57d),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0=
-xd77255fa),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0=
-x6a709903),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0=
-x18430676),
-> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0=
-x6f933767),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb=
-8cf2, 0x16dc1ba7),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb=
-8cf2, 0x19816c41),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb=
-8cf2, 0x64112029),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230=
-", 0x3beb8cf2, 0xdb9e58bc),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb=
-8cf2, 0x16dc1ba7),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb=
-8cf2, 0x19816c41),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb=
-8cf2, 0x64112029),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
-> + PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb=
-8cf2, 0x1cce7ac4),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
+> PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
+> @@ -797,30 +797,30 @@ static const struct pcmcia_device_id serial_ids[] = {
+> PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "cis/COMpad2.cis"),
+> PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
+> PCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, "cis/GLOBETROTTER.cis"),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100 1.00.",0x19ca78af,0xf964f42b),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL100",0x19ca78af,0x71d98e83),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232 1.00.",0x19ca78af,0x69fb7490),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.","SERIAL CARD: SL232",0x19ca78af,0xb6bc0235),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232",0x63f2e0bd,0xb9e175d3),
+> - PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.","SERIAL CARD: CF232-5",0x63f2e0bd,0xfce33442),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232",0x3beb8cf2,0x171e7190),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF232-5",0x3beb8cf2,0x20da4262),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF428",0x3beb8cf2,0xea5dd57d),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: CF500",0x3beb8cf2,0xd77255fa),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: IC232",0x3beb8cf2,0x6a709903),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: SL232",0x3beb8cf2,0x18430676),
+> - PCMCIA_DEVICE_PROD_ID12("Elan","Serial Port: XL232",0x3beb8cf2,0x6f933767),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(0,"Elan","Serial+Parallel Port: SP230",0x3beb8cf2,0xdb9e58bc),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: CF332",0x3beb8cf2,0x16dc1ba7),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL332",0x3beb8cf2,0x19816c41),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL385",0x3beb8cf2,0x64112029),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(1,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(2,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> - PCMCIA_MFC_DEVICE_PROD_ID12(3,"Elan","Serial Port: SL432",0x3beb8cf2,0x1cce7ac4),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100 1.00.", 0x19ca78af, 0xf964f42b),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL100", 0x19ca78af, 0x71d98e83),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232 1.00.", 0x19ca78af, 0x69fb7490),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c1997.", "SERIAL CARD: SL232", 0x19ca78af, 0xb6bc0235),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232", 0x63f2e0bd, 0xb9e175d3),
+> + PCMCIA_DEVICE_PROD_ID12("ELAN DIGITAL SYSTEMS LTD, c2000.", "SERIAL CARD: CF232-5", 0x63f2e0bd, 0xfce33442),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232", 0x3beb8cf2, 0x171e7190),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF232-5", 0x3beb8cf2, 0x20da4262),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF428", 0x3beb8cf2, 0xea5dd57d),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: CF500", 0x3beb8cf2, 0xd77255fa),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: IC232", 0x3beb8cf2, 0x6a709903),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: SL232", 0x3beb8cf2, 0x18430676),
+> + PCMCIA_DEVICE_PROD_ID12("Elan", "Serial Port: XL232", 0x3beb8cf2, 0x6f933767),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(0, "Elan", "Serial+Parallel Port: SP230", 0x3beb8cf2, 0xdb9e58bc),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: CF332", 0x3beb8cf2, 0x16dc1ba7),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL332", 0x3beb8cf2, 0x19816c41),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL385", 0x3beb8cf2, 0x64112029),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(1, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(2, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
+> + PCMCIA_MFC_DEVICE_PROD_ID12(3, "Elan", "Serial Port: SL432", 0x3beb8cf2, 0x1cce7ac4),
> PCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),
> /* too generic */
> /* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */
@@ -543,7 +448,6 @@ ok
--
-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
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index 860c2fb..2078951 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -39,7 +39,7 @@
" 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"
]
[
"\0000:1\0"
@@ -57,7 +57,7 @@
"\n",
"Comments below.\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",
@@ -72,182 +72,168 @@
"> drivers/tty/serial/8250/8250_hub6.c | 2 +-\n",
"> drivers/tty/serial/8250/8250_pci.c | 7 +++-\n",
"> drivers/tty/serial/8250/8250_port.c | 3 ++\n",
- "> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++----=\n",
- "----------\n",
+ "> drivers/tty/serial/8250/serial_cs.c | 58 ++++++++++++++--------------\n",
"> 12 files changed, 52 insertions(+), 36 deletions(-)\n",
- ">=20\n",
- "> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/seri=\n",
- "al/8250/8250_accent.c\n",
+ "> \n",
+ "> diff --git a/drivers/tty/serial/8250/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c\n",
"> index 34b51c6..c480729 100644\n",
"> --- a/drivers/tty/serial/8250/8250_accent.c\n",
"> +++ b/drivers/tty/serial/8250/8250_accent.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/seria=\n",
- "l/8250/8250_acorn.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c\n",
"> index 549aa07..402dfdd 100644\n",
"> --- a/drivers/tty/serial/8250/8250_acorn.c\n",
"> +++ b/drivers/tty/serial/8250/8250_acorn.c\n",
- "> \@\@ -70,7 +70,7 \@\@ serial_card_probe(struct expansion_card *ec, const =\n",
- "struct ecard_id *id)\n",
- "> \tuart.port.regshift\t=3D 2;\n",
- "> \tuart.port.dev\t=3D &ec->dev;\n",
- "> =20\n",
- "> -\tfor (i =3D 0; i < info->num_ports; i ++) {\n",
- "> +\tfor (i =3D 0; i < info->num_ports; i++) {\n",
+ "> \@\@ -70,7 +70,7 \@\@ serial_card_probe(struct expansion_card *ec, const struct ecard_id *id)\n",
+ "> \tuart.port.regshift\t= 2;\n",
+ "> \tuart.port.dev\t= &ec->dev;\n",
+ "> \n",
+ "> -\tfor (i = 0; i < info->num_ports; i ++) {\n",
+ "> +\tfor (i = 0; i < info->num_ports; i++) {\n",
"\n",
"Ok\n",
"\n",
- "> \t\tuart.port.membase =3D info->vaddr + type->offset[i];\n",
- "> \t\tuart.port.mapbase =3D bus_addr + type->offset[i];\n",
- "> =20\n",
- "> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial=\n",
- "/8250/8250_boca.c\n",
+ "> \t\tuart.port.membase = info->vaddr + type->offset[i];\n",
+ "> \t\tuart.port.mapbase = bus_addr + type->offset[i];\n",
+ "> \n",
+ "> diff --git a/drivers/tty/serial/8250/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c\n",
"> index d125dc1..e42a5b5 100644\n",
"> --- a/drivers/tty/serial/8250/8250_boca.c\n",
"> +++ b/drivers/tty/serial/8250/8250_boca.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=\n",
- "/8250/8250_core.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c\n",
"> index 3912646..89a20c9 100644\n",
"> --- a/drivers/tty/serial/8250/8250_core.c\n",
"> +++ b/drivers/tty/serial/8250/8250_core.c\n",
"> \@\@ -756,6 +756,7 \@\@ void serial8250_suspend_port(int line)\n",
"> \tif (!console_suspend_enabled && uart_console(port) &&\n",
- "> \t port->type !=3D PORT_8250) {\n",
- "> \t\tunsigned char canary =3D 0xa5;\n",
+ "> \t port->type != PORT_8250) {\n",
+ "> \t\tunsigned char canary = 0xa5;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\tserial_out(up, UART_SCR, canary);\n",
- "> \t\tif (serial_in(up, UART_SCR) =3D=3D canary)\n",
- "> \t\t\tup->canary =3D canary;\n",
- "> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8=\n",
- "250/8250_dw.c\n",
+ "> \t\tif (serial_in(up, UART_SCR) == canary)\n",
+ "> \t\t\tup->canary = canary;\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c\n",
"> index a5d319e..0f67355 100644\n",
"> --- a/drivers/tty/serial/8250/8250_dw.c\n",
"> +++ b/drivers/tty/serial/8250/8250_dw.c\n",
- "> \@\@ -102,8 +102,10 \@\@ static void dw8250_serial_out(struct uart_port *=\n",
- "p, int offset, int value)\n",
+ "> \@\@ -102,8 +102,10 \@\@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> \@\@ -143,8 +145,10 \@\@ static void dw8250_serial_outq(struct uart_port =\n",
- "*p, int offset, int value)\n",
+ "> \@\@ -143,8 +145,10 \@\@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"In particular, I dislike separation between initialized variables and\n",
- "following statements, _especially_ when the initialization is non-trivi=\n",
- "al.\n",
+ "following statements, _especially_ when the initialization is non-trivial.\n",
"\n",
"\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> \@\@ -166,8 +170,10 \@\@ static void dw8250_serial_out32(struct uart_port=\n",
- " *p, int offset, int value)\n",
+ "> \@\@ -166,8 +170,10 \@\@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)\n",
"> \t/* Make sure LCR write wasn't ignored */\n",
- "> \tif (offset =3D=3D UART_LCR) {\n",
- "> \t\tint tries =3D 1000;\n",
+ "> \tif (offset == UART_LCR) {\n",
+ "> \t\tint tries = 1000;\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
"> \t\twhile (tries--) {\n",
- "> \t\t\tunsigned int lcr =3D p->serial_in(p, UART_LCR);\n",
+ "> \t\t\tunsigned int lcr = p->serial_in(p, UART_LCR);\n",
"> +\n",
"\n",
"Not ok.\n",
"\n",
- "> \t\t\tif ((value & ~UART_LCR_SPAR) =3D=3D (lcr & ~UART_LCR_SPAR))\n",
+ "> \t\t\tif ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))\n",
"> \t\t\t\treturn;\n",
"> \t\t\tdw8250_force_idle(p);\n",
- "> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/t=\n",
- "ty/serial/8250/8250_exar_st16c554.c\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> index bf53aab..999f2d3 100644\n",
"> --- a/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c\n",
"> \@\@ -13,7 +13,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/se=\n",
- "rial/8250/8250_fourport.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c\n",
"> index be15826..9a04a8a 100644\n",
"> --- a/drivers/tty/serial/8250/8250_fourport.c\n",
"> +++ b/drivers/tty/serial/8250/8250_fourport.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define PORT(_base,_irq)\t\t\t\t\t\t\\\n",
"> +#define PORT(_base, _irq)\t\t\t\t\t\t\\\n",
"\n",
"Ok\n",
"\n",
"> \t{\t\t\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D _base,\t\t\t\t\\\n",
- "> \t\t.irq\t\t=3D _irq,\t\t\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=\n",
- "l/8250/8250_hp300.c\n",
+ "> \t\t.iobase\t\t= _base,\t\t\t\t\\\n",
+ "> \t\t.irq\t\t= _irq,\t\t\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c\n",
"> index 2891958..38d8cb2 100644\n",
"> --- a/drivers/tty/serial/8250/8250_hp300.c\n",
"> +++ b/drivers/tty/serial/8250/8250_hp300.c\n",
"> \@\@ -125,6 +125,7 \@\@ int __init hp300_setup_serial_console(void)\n",
"> \t} else {\n",
"> #ifdef CONFIG_HPDCA\n",
- "> \t\tunsigned long pa =3D dio_scodetophysaddr(scode);\n",
+ "> \t\tunsigned long pa = dio_scodetophysaddr(scode);\n",
"> +\n",
"> \t\tif (!pa)\n",
"> \t\t\treturn 0;\n",
@@ -255,71 +241,64 @@
"Not ok.\n",
"\n",
"This is a particularly good example of how bad that style is.\n",
- "The relevant code is the call to dio_scode_tophysaddr() _not the if (!p=\n",
- "a)_\n",
+ "The relevant code is the call to dio_scode_tophysaddr() _not the if (!pa)_\n",
"\n",
"Newline after uninitialized vars - ok.\n",
- "Newline after initialized vars - not ok. Unless trivial initialization =\n",
- "and\n",
+ "Newline after initialized vars - not ok. Unless trivial initialization and\n",
"you wrote it.\n",
"\n",
"\n",
- "> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial=\n",
- "/8250/8250_hub6.c\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c\n",
"> index a5c778e..27124e2 100644\n",
"> --- a/drivers/tty/serial/8250/8250_hub6.c\n",
"> +++ b/drivers/tty/serial/8250/8250_hub6.c\n",
"> \@\@ -10,7 +10,7 \@\@\n",
"> #include <linux/init.h>\n",
"> #include <linux/serial_8250.h>\n",
- "> =20\n",
+ "> \n",
"> -#define HUB6(card,port)\t\t\t\t\t\t\t\\\n",
"> +#define HUB6(card, port)\t\t\t\t\t\t\\\n",
"\n",
"ok\n",
"\n",
"> \t{\t\t\t\t\t\t\t\t\\\n",
- "> \t\t.iobase\t\t=3D 0x302,\t\t\t\t\\\n",
- "> \t\t.irq\t\t=3D 3,\t\t\t\t\t\\\n",
- "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n",
- "8250/8250_pci.c\n",
+ "> \t\t.iobase\t\t= 0x302,\t\t\t\t\\\n",
+ "> \t\t.irq\t\t= 3,\t\t\t\t\t\\\n",
+ "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n",
"> index 4097f3f..ed99fdf 100644\n",
"> --- a/drivers/tty/serial/8250/8250_pci.c\n",
"> +++ b/drivers/tty/serial/8250/8250_pci.c\n",
- "> \@\@ -113,6 +113,7 \@\@ static int addidata_apci7800_setup(struct serial_=\n",
- "private *priv,\n",
+ "> \@\@ -113,6 +113,7 \@\@ static int addidata_apci7800_setup(struct serial_private *priv,\n",
"> \t\t\t\tstruct uart_8250_port *port, int idx)\n",
"> {\n",
- "> \tunsigned int bar =3D 0, offset =3D board->first_offset;\n",
+ "> \tunsigned int bar = 0, offset = board->first_offset;\n",
"> +\n",
"\n",
"not ok\n",
"\n",
- "> \tbar =3D FL_GET_BASE(board->flags);\n",
- "> =20\n",
+ "> \tbar = FL_GET_BASE(board->flags);\n",
+ "> \n",
"> \tif (idx < 2) {\n",
- "> \@\@ -1115,6 +1116,7 \@\@ static struct quatech_feature quatech_cards[] =3D=\n",
- " {\n",
+ "> \@\@ -1115,6 +1116,7 \@\@ static struct quatech_feature quatech_cards[] = {\n",
"> static int pci_quatech_amcc(u16 devid)\n",
"> {\n",
- "> \tstruct quatech_feature *qf =3D &quatech_cards[0];\n",
+ "> \tstruct quatech_feature *qf = &quatech_cards[0];\n",
"> +\n",
"\n",
"not ok\n",
"\n",
"> \twhile (qf->devid) {\n",
- "> \t\tif (qf->devid =3D=3D devid)\n",
+ "> \t\tif (qf->devid == devid)\n",
"> \t\t\treturn qf->amcc;\n",
- "> \@\@ -1200,6 +1202,7 \@\@ static int pci_quatech_test(struct uart_8250_po=\n",
- "rt *port)\n",
+ "> \@\@ -1200,6 +1202,7 \@\@ static int pci_quatech_test(struct uart_8250_port *port)\n",
"> {\n",
"> \tu8 reg;\n",
- "> \tu8 qopr =3D pci_quatech_rqopr(port);\n",
+ "> \tu8 qopr = pci_quatech_rqopr(port);\n",
"> +\n",
"\n",
"Swap the declaration order and its ok. IOW,\n",
"\n",
- "+ \tu8 qopr =3D pci_quatech_rqopr(port);\n",
+ "+ \tu8 qopr = pci_quatech_rqopr(port);\n",
"+ \tu8 reg;\n",
"+\n",
"\n",
@@ -327,16 +306,15 @@
"\n",
"+ \tu8 reg, qopr;\n",
"+\n",
- "+ \tqopr =3D pci_quatech_rqopr(port);\n",
+ "+ \tqopr = pci_quatech_rqopr(port);\n",
"\n",
"> \tpci_quatech_wqopr(port, qopr & QPCR_TEST_FOR1);\n",
- "> \treg =3D pci_quatech_rqopr(port) & 0xC0;\n",
- "> \tif (reg !=3D QPCR_TEST_GET1)\n",
- "> \@\@ -1284,8 +1287,10 \@\@ static int pci_quatech_init(struct pci_dev *de=\n",
- "v)\n",
+ "> \treg = pci_quatech_rqopr(port) & 0xC0;\n",
+ "> \tif (reg != QPCR_TEST_GET1)\n",
+ "> \@\@ -1284,8 +1287,10 \@\@ static int pci_quatech_init(struct pci_dev *dev)\n",
"> {\n",
"> \tif (pci_quatech_amcc(dev->device)) {\n",
- "> \t\tunsigned long base =3D pci_resource_start(dev, 0);\n",
+ "> \t\tunsigned long base = pci_resource_start(dev, 0);\n",
"> +\n",
"\n",
"not ok\n",
@@ -349,10 +327,9 @@
"ok\n",
"\n",
"> \t\t\toutl(inl(base + 0x38) | 0x00002000, base + 0x38);\n",
- "> \t\t\ttmp =3D inl(base + 0x3c);\n",
+ "> \t\t\ttmp = inl(base + 0x3c);\n",
"> \t\t\toutl(tmp | 0x01000000, base + 0x3c);\n",
- "> \@\@ -4502,7 +4507,7 \@\@ static struct pci_device_id serial_pci_tbl[] =3D=\n",
- " {\n",
+ "> \@\@ -4502,7 +4507,7 \@\@ static struct pci_device_id serial_pci_tbl[] = {\n",
"> \t\tPCI_ANY_ID, PCI_ANY_ID, 0, 0,\n",
"> \t\tpbn_b0_bt_2_921600 },\n",
"> \t{\tPCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,\n",
@@ -362,27 +339,24 @@
"ok\n",
"\n",
"> \t\tpbn_b2_8_1152000 },\n",
- "> =20\n",
+ "> \n",
"> \t/*\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 52d82d2..ae8f993 100644\n",
"> --- a/drivers/tty/serial/8250/8250_port.c\n",
"> +++ b/drivers/tty/serial/8250/8250_port.c\n",
- "> \@\@ -1327,6 +1327,7 \@\@ static void serial8250_start_tx(struct uart_por=\n",
- "t *port)\n",
- "> =20\n",
+ "> \@\@ -1327,6 +1327,7 \@\@ static void serial8250_start_tx(struct uart_port *port)\n",
+ "> \n",
"> \t\tif (up->bugs & UART_BUG_TXEN) {\n",
"> \t\t\tunsigned char lsr;\n",
"> +\n",
"\n",
"ok\n",
"\n",
- "> \t\t\tlsr =3D serial_in(up, UART_LSR);\n",
- "> \t\t\tup->lsr_saved_flags |=3D lsr & LSR_SAVE_FLAGS;\n",
+ "> \t\t\tlsr = serial_in(up, UART_LSR);\n",
+ "> \t\t\tup->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;\n",
"> \t\t\tif (lsr & UART_LSR_THRE)\n",
- "> \@\@ -1734,8 +1735,10 \@\@ static void wait_for_xmitr(struct uart_8250_po=\n",
- "rt *up, int bits)\n",
+ "> \@\@ -1734,8 +1735,10 \@\@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)\n",
"> \t/* Wait up to 1s for flow control if necessary */\n",
"> \tif (up->port.flags & UPF_CONS_FLOW) {\n",
"> \t\tunsigned int tmout;\n",
@@ -390,201 +364,132 @@
"\n",
"ok\n",
"\n",
- "> \t\tfor (tmout =3D 1000000; tmout; tmout--) {\n",
- "> \t\t\tunsigned int msr =3D serial_in(up, UART_MSR);\n",
+ "> \t\tfor (tmout = 1000000; tmout; tmout--) {\n",
+ "> \t\t\tunsigned int msr = serial_in(up, UART_MSR);\n",
"> +\n",
"\n",
"not ok\n",
"\n",
- "> \t\t\tup->msr_saved_flags |=3D msr & MSR_SAVE_FLAGS;\n",
+ "> \t\t\tup->msr_saved_flags |= msr & MSR_SAVE_FLAGS;\n",
"> \t\t\tif (msr & UART_MSR_CTS)\n",
"> \t\t\t\tbreak;\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 4d180c9..f5270ba 100644\n",
"> --- a/drivers/tty/serial/8250/serial_cs.c\n",
"> +++ b/drivers/tty/serial/8250/serial_cs.c\n",
- "> \@\@ -257,7 +257,7 \@\@ static const struct serial_quirk quirks[] =3D {\n",
+ "> \@\@ -257,7 +257,7 \@\@ static const struct serial_quirk quirks[] = {\n",
"> };\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> -static int serial_config(struct pcmcia_device * link);\n",
"> +static int serial_config(struct pcmcia_device *link);\n",
"\n",
"ok\n",
"\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> static void serial_remove(struct pcmcia_device *link)\n",
- "> \@\@ -309,7 +309,7 \@\@ static int serial_probe(struct pcmcia_device *lin=\n",
- "k)\n",
+ "> \@\@ -309,7 +309,7 \@\@ static int serial_probe(struct pcmcia_device *link)\n",
"> \tdev_dbg(&link->dev, \"serial_attach()\\n\");\n",
- "> =20\n",
+ "> \n",
"> \t/* Create new serial device */\n",
- "> -\tinfo =3D kzalloc(sizeof (*info), GFP_KERNEL);\n",
- "> +\tinfo =3D kzalloc(sizeof(*info), GFP_KERNEL);\n",
+ "> -\tinfo = kzalloc(sizeof (*info), GFP_KERNEL);\n",
+ "> +\tinfo = kzalloc(sizeof(*info), GFP_KERNEL);\n",
"\n",
"ok\n",
"\n",
"> \tif (!info)\n",
"> \t\treturn -ENOMEM;\n",
- "> \tinfo->p_dev =3D link;\n",
- "> \@\@ -339,7 +339,7 \@\@ static void serial_detach(struct pcmcia_device *l=\n",
- "ink)\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=\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",
- "> =20\n",
- "> -static int setup_serial(struct pcmcia_device *handle, struct serial_=\n",
- "info * info,\n",
- "> +static int setup_serial(struct pcmcia_device *handle, struct serial_=\n",
- "info *info,\n",
+ "> \tinfo->p_dev = link;\n",
+ "> \@\@ -339,7 +339,7 \@\@ static void serial_detach(struct pcmcia_device *link)\n",
+ "> \n",
+ "> /*====================================================================*/\n",
+ "> \n",
+ "> -static int setup_serial(struct pcmcia_device *handle, struct serial_info * info,\n",
+ "> +static int setup_serial(struct pcmcia_device *handle, struct serial_info *info,\n",
"\n",
"ok\n",
"\n",
"> \t\t\tunsigned int iobase, int irq)\n",
"> {\n",
"> \tstruct uart_8250_port uart;\n",
- "> \@\@ -600,7 +600,7 \@\@ static int serial_check_for_multi(struct pcmcia_d=\n",
- "evice *p_dev, void *priv_data)\n",
+ "> \@\@ -600,7 +600,7 \@\@ static int serial_check_for_multi(struct pcmcia_device *p_dev, void *priv_data)\n",
"> }\n",
- "> =20\n",
- "> =20\n",
+ "> \n",
+ "> \n",
"> -static int serial_config(struct pcmcia_device * link)\n",
"> +static int serial_config(struct pcmcia_device *link)\n",
"\n",
"ok\n",
"\n",
"> {\n",
- "> \tstruct serial_info *info =3D link->priv;\n",
+ "> \tstruct serial_info *info = link->priv;\n",
"> \tint i;\n",
- "> \@\@ -701,7 +701,7 \@\@ static const struct pcmcia_device_id serial_ids[]=\n",
- " =3D {\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"LINKSYS\", \"PCMLM336\", 0xf7cb0b07, 0=\n",
- "x7a821b58),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MEGAHERTZ\", \"XJEM1144/CCEM1144\", 0x=\n",
- "f510db04, 0x52d21e1e),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MICRO RESEARCH\", \"COMBO-L/M-336\", 0=\n",
- "xb2ced065, 0x3ced0555),\n",
- "> -\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\" ,0x18df0ba0 ,0x8=\n",
- "31b1064),\n",
- "> +\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\", 0x18df0ba0, 0x8=\n",
- "31b1064),\n",
+ "> \@\@ -701,7 +701,7 \@\@ static const struct pcmcia_device_id serial_ids[] = {\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"LINKSYS\", \"PCMLM336\", 0xf7cb0b07, 0x7a821b58),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MEGAHERTZ\", \"XJEM1144/CCEM1144\", 0xf510db04, 0x52d21e1e),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"MICRO RESEARCH\", \"COMBO-L/M-336\", 0xb2ced065, 0x3ced0555),\n",
+ "> -\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\" ,0x18df0ba0 ,0x831b1064),\n",
+ "> +\tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"NEC\", \"PK-UG-J001\", 0x18df0ba0, 0x831b1064),\n",
"\n",
"ok\n",
"\n",
"\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Diamon=\n",
- "ds Modem+Ethernet\", 0xc2f80cd, 0x656947b9),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Hearts=\n",
- " Modem+Ethernet\", 0xc2f80cd, 0xdc9ba5ed),\n",
- "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"PCMCIAs\", \"ComboCard\", 0xdcfe12d3, =\n",
- "0xcd8906cc),\n",
- "> \@\@ -797,30 +797,30 \@\@ static const struct pcmcia_device_id serial_ids=\n",
- "[] =3D {\n",
- "> \tPCMCIA_DEVICE_CIS_PROD_ID123(\"ADVANTECH\", \"COMpad-32/85\", \"1.0\", 0x=\n",
- "96913a85, 0x8fbe92ae, 0x0877b627, \"cis/COMpad2.cis\"),\n",
- "> \tPCMCIA_DEVICE_CIS_PROD_ID2(\"RS-COM 2P\", 0xad20b156, \"cis/RS-COM-2P.=\n",
- "cis\"),\n",
- "> \tPCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, \"cis/GLOBETROTTER.cis\")=\n",
- ",\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL100 1.00.\",0x19ca78af,0xf964f42b),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL100\",0x19ca78af,0x71d98e83),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL232 1.00.\",0x19ca78af,0x69fb7490),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL =\n",
- "CARD: SL232\",0x19ca78af,0xb6bc0235),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL =\n",
- "CARD: CF232\",0x63f2e0bd,0xb9e175d3),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL =\n",
- "CARD: CF232-5\",0x63f2e0bd,0xfce33442),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232\",0x3beb8cf2,0x17=\n",
- "1e7190),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232-5\",0x3beb8cf2,0x=\n",
- "20da4262),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF428\",0x3beb8cf2,0xea=\n",
- "5dd57d),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF500\",0x3beb8cf2,0xd7=\n",
- "7255fa),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: IC232\",0x3beb8cf2,0x6a=\n",
- "709903),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: SL232\",0x3beb8cf2,0x18=\n",
- "430676),\n",
- "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: XL232\",0x3beb8cf2,0x6f=\n",
- "933767),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: CF332\",0x3beb8cf=\n",
- "2,0x16dc1ba7),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL332\",0x3beb8cf=\n",
- "2,0x19816c41),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL385\",0x3beb8cf=\n",
- "2,0x64112029),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial+Parallel Port: SP230\",=\n",
- "0x3beb8cf2,0xdb9e58bc),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: CF332\",0x3beb8cf=\n",
- "2,0x16dc1ba7),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL332\",0x3beb8cf=\n",
- "2,0x19816c41),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL385\",0x3beb8cf=\n",
- "2,0x64112029),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(2,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(3,\"Elan\",\"Serial Port: SL432\",0x3beb8cf=\n",
- "2,0x1cce7ac4),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL100 1.00.\", 0x19ca78af, 0xf964f42b),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL100\", 0x19ca78af, 0x71d98e83),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL232 1.00.\", 0x19ca78af, 0x69fb7490),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL=\n",
- " CARD: SL232\", 0x19ca78af, 0xb6bc0235),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL=\n",
- " CARD: CF232\", 0x63f2e0bd, 0xb9e175d3),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL=\n",
- " CARD: CF232-5\", 0x63f2e0bd, 0xfce33442),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232\", 0x3beb8cf2, 0=\n",
- "x171e7190),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232-5\", 0x3beb8cf2,=\n",
- " 0x20da4262),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF428\", 0x3beb8cf2, 0=\n",
- "xea5dd57d),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF500\", 0x3beb8cf2, 0=\n",
- "xd77255fa),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: IC232\", 0x3beb8cf2, 0=\n",
- "x6a709903),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: SL232\", 0x3beb8cf2, 0=\n",
- "x18430676),\n",
- "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: XL232\", 0x3beb8cf2, 0=\n",
- "x6f933767),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: CF332\", 0x3beb=\n",
- "8cf2, 0x16dc1ba7),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL332\", 0x3beb=\n",
- "8cf2, 0x19816c41),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL385\", 0x3beb=\n",
- "8cf2, 0x64112029),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial+Parallel Port: SP230=\n",
- "\", 0x3beb8cf2, 0xdb9e58bc),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: CF332\", 0x3beb=\n",
- "8cf2, 0x16dc1ba7),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL332\", 0x3beb=\n",
- "8cf2, 0x19816c41),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL385\", 0x3beb=\n",
- "8cf2, 0x64112029),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(2, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
- "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(3, \"Elan\", \"Serial Port: SL432\", 0x3beb=\n",
- "8cf2, 0x1cce7ac4),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Diamonds Modem+Ethernet\", 0xc2f80cd, 0x656947b9),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"Ositech\", \"Trumpcard:Jack of Hearts Modem+Ethernet\", 0xc2f80cd, 0xdc9ba5ed),\n",
+ "> \tPCMCIA_PFC_DEVICE_PROD_ID12(1, \"PCMCIAs\", \"ComboCard\", 0xdcfe12d3, 0xcd8906cc),\n",
+ "> \@\@ -797,30 +797,30 \@\@ static const struct pcmcia_device_id serial_ids[] = {\n",
+ "> \tPCMCIA_DEVICE_CIS_PROD_ID123(\"ADVANTECH\", \"COMpad-32/85\", \"1.0\", 0x96913a85, 0x8fbe92ae, 0x0877b627, \"cis/COMpad2.cis\"),\n",
+ "> \tPCMCIA_DEVICE_CIS_PROD_ID2(\"RS-COM 2P\", 0xad20b156, \"cis/RS-COM-2P.cis\"),\n",
+ "> \tPCMCIA_DEVICE_CIS_MANF_CARD(0x0013, 0x0000, \"cis/GLOBETROTTER.cis\"),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL100 1.00.\",0x19ca78af,0xf964f42b),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL100\",0x19ca78af,0x71d98e83),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL232 1.00.\",0x19ca78af,0x69fb7490),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\",\"SERIAL CARD: SL232\",0x19ca78af,0xb6bc0235),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL CARD: CF232\",0x63f2e0bd,0xb9e175d3),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\",\"SERIAL CARD: CF232-5\",0x63f2e0bd,0xfce33442),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232\",0x3beb8cf2,0x171e7190),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF232-5\",0x3beb8cf2,0x20da4262),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF428\",0x3beb8cf2,0xea5dd57d),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: CF500\",0x3beb8cf2,0xd77255fa),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: IC232\",0x3beb8cf2,0x6a709903),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: SL232\",0x3beb8cf2,0x18430676),\n",
+ "> -\tPCMCIA_DEVICE_PROD_ID12(\"Elan\",\"Serial Port: XL232\",0x3beb8cf2,0x6f933767),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: CF332\",0x3beb8cf2,0x16dc1ba7),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL332\",0x3beb8cf2,0x19816c41),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL385\",0x3beb8cf2,0x64112029),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(0,\"Elan\",\"Serial+Parallel Port: SP230\",0x3beb8cf2,0xdb9e58bc),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: CF332\",0x3beb8cf2,0x16dc1ba7),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL332\",0x3beb8cf2,0x19816c41),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL385\",0x3beb8cf2,0x64112029),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(1,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(2,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> -\tPCMCIA_MFC_DEVICE_PROD_ID12(3,\"Elan\",\"Serial Port: SL432\",0x3beb8cf2,0x1cce7ac4),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL100 1.00.\", 0x19ca78af, 0xf964f42b),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL100\", 0x19ca78af, 0x71d98e83),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL232 1.00.\", 0x19ca78af, 0x69fb7490),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c1997.\", \"SERIAL CARD: SL232\", 0x19ca78af, 0xb6bc0235),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL CARD: CF232\", 0x63f2e0bd, 0xb9e175d3),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"ELAN DIGITAL SYSTEMS LTD, c2000.\", \"SERIAL CARD: CF232-5\", 0x63f2e0bd, 0xfce33442),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232\", 0x3beb8cf2, 0x171e7190),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF232-5\", 0x3beb8cf2, 0x20da4262),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF428\", 0x3beb8cf2, 0xea5dd57d),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: CF500\", 0x3beb8cf2, 0xd77255fa),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: IC232\", 0x3beb8cf2, 0x6a709903),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: SL232\", 0x3beb8cf2, 0x18430676),\n",
+ "> +\tPCMCIA_DEVICE_PROD_ID12(\"Elan\", \"Serial Port: XL232\", 0x3beb8cf2, 0x6f933767),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: CF332\", 0x3beb8cf2, 0x16dc1ba7),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL332\", 0x3beb8cf2, 0x19816c41),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL385\", 0x3beb8cf2, 0x64112029),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(0, \"Elan\", \"Serial+Parallel Port: SP230\", 0x3beb8cf2, 0xdb9e58bc),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: CF332\", 0x3beb8cf2, 0x16dc1ba7),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL332\", 0x3beb8cf2, 0x19816c41),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL385\", 0x3beb8cf2, 0x64112029),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(1, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(2, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
+ "> +\tPCMCIA_MFC_DEVICE_PROD_ID12(3, \"Elan\", \"Serial Port: SL432\", 0x3beb8cf2, 0x1cce7ac4),\n",
"> \tPCMCIA_DEVICE_MANF_CARD(0x0279, 0x950b),\n",
"> \t/* too generic */\n",
"> \t/* PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0160, 0x0002), */\n",
@@ -593,10 +498,9 @@
"\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"
]
-50808c9ab79c873a6031dc929143f3d005aebe64baa8a6a3caff73004a14322e
+5339ebe2aa92138a1eebe5f82039f8cb86d3502844d3581d977d8036d8791ead
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.