diff for duplicates of <567198AA.2030503@hurleysoftware.com> diff --git a/a/1.txt b/N1/1.txt index 01e9de1..9809b1b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,12 @@ Hi Anton, On 12/16/2015 07:36 AM, Anton Wuerfel wrote: -> This patch replaces printk by the corresponding variant of pr_* in or= -der to +> This patch replaces printk by the corresponding variant of pr_* in order to > fix checkpatch warnings. 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 > --- @@ -17,45 +16,40 @@ Comments below. > drivers/tty/serial/8250/8250_pnp.c | 6 +++--- > drivers/tty/serial/8250/8250_port.c | 3 +-- > 5 files changed, 15 insertions(+), 19 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial= -/8250/8250_core.c +> +> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c > index 2b3731f..b5e0c48 100644 > --- a/drivers/tty/serial/8250/8250_core.c > +++ b/drivers/tty/serial/8250/8250_core.c > @@ -1095,9 +1095,8 @@ static int __init serial8250_init(void) -> =20 +> > serial8250_isa_init_ports(); -> =20 +> > - printk(KERN_INFO "Serial: 8250/16550 driver, " > - "%d ports, IRQ sharing %sabled\n", nr_uarts, > - share_irqs ? "en" : "dis"); -> + pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n= -", +> + pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n", > + nr_uarts, share_irqs ? "en" : "dis"); -> =20 +> > #ifdef CONFIG_SPARC -> ret =3D sunserial_register_minors(&serial8250_reg, UART_NR); -> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/= -8250/8250_gsc.c +> ret = sunserial_register_minors(&serial8250_reg, UART_NR); +> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c > index 2e3ea1a..a9b63d0 100644 > --- a/drivers/tty/serial/8250/8250_gsc.c > +++ b/drivers/tty/serial/8250/8250_gsc.c -> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_de= -vice *dev) +> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev) > * the user what they're missing. > */ -> if (parisc_parent(dev)->id.hw_type !=3D HPHW_IOA) +> if (parisc_parent(dev)->id.hw_type != HPHW_IOA) > - printk(KERN_INFO > - "Serial: device 0x%llx not configured.\n" > + pr_info("Serial: device 0x%llx not configured.\n" > "Enable support for Wax, Lasi, Asp or Dino.\n", > (unsigned long long)dev->hpa.start); > return -ENODEV; -> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_de= -vice *dev) -> =20 -> err =3D serial8250_register_8250_port(&uart); +> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev) +> +> err = serial8250_register_8250_port(&uart); > if (err < 0) { > - printk(KERN_WARNING > - "serial8250_register_8250_port returned error %d\n", err); @@ -63,58 +57,50 @@ vice *dev) > iounmap(uart.port.membase); > return err; > } -> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria= -l/8250/8250_hp300.c +> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c > index 52c43da..85b574896 100644 > --- a/drivers/tty/serial/8250/8250_hp300.c > +++ b/drivers/tty/serial/8250/8250_hp300.c > @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void) > /* Check for APCI console */ -> if (scode =3D=3D 256) { +> if (scode == 256) { > #ifdef CONFIG_HPAPCI > - printk(KERN_INFO "Serial console is HP APCI 1\n"); > + pr_info("Serial console is HP APCI 1\n"); -> =20 -> port.uartclk =3D HPAPCI_BAUD_BASE * 16; -> port.mapbase =3D (FRODO_BASE + FRODO_APCI_OFFSET(1)); +> +> port.uartclk = HPAPCI_BAUD_BASE * 16; +> port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1)); > @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void) -> port.regshift =3D 2; +> port.regshift = 2; > add_preferred_console("ttyS", port.line, "9600n8"); > #else -> - printk(KERN_WARNING "Serial console is APCI but support is disable= -d (CONFIG_HPAPCI)!\n"); -> + pr_warn("Serial console is APCI but support is disabled (CONFIG_HP= -APCI)!\n"); +> - printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); +> + pr_warn("Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); > return 0; > #endif > } else { > @@ -128,7 +128,7 @@ int __init hp300_setup_serial_console(void) > if (!pa) > return 0; -> =20 -> - printk(KERN_INFO "Serial console is HP DCA at select code %d\n", s= -code); +> +> - printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode); > + pr_info("Serial console is HP DCA at select code %d\n", scode); -> =20 -> port.uartclk =3D HPDCA_BAUD_BASE * 16; -> port.mapbase =3D (pa + UART_OFFSET); +> +> port.uartclk = HPDCA_BAUD_BASE * 16; +> port.mapbase = (pa + UART_OFFSET); > @@ -142,13 +142,13 @@ int __init hp300_setup_serial_console(void) > if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) > add_preferred_console("ttyS", port.line, "9600n8"); > #else -> - printk(KERN_WARNING "Serial console is DCA but support is disabled= - (CONFIG_HPDCA)!\n"); -> + pr_warn("Serial console is DCA but support is disabled (CONFIG_HPD= -CA)!\n"); +> - printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); +> + pr_warn("Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); > return 0; > #endif > } -> =20 +> > if (early_serial_setup(&port) < 0) -> - printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_se= -tup() failed.\n"); -> + pr_warn("hp300_setup_serial_console(): early_serial_setup() failed= -=2E\n"); +> - printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n"); +> + pr_warn("hp300_setup_serial_console(): early_serial_setup() failed.\n"); > return 0; > } > #endif /* CONFIG_SERIAL_8250_CONSOLE */ @@ -123,8 +109,8 @@ tup() failed.\n"); > @@ -180,7 +180,7 @@ static int hpdca_init_one(struct dio_dev *d, -> line =3D serial8250_register_8250_port(&uart); -> =20 +> line = serial8250_register_8250_port(&uart); +> > if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d" > + pr_notice("8250_hp300: register_serial() DCA scode %d" @@ -132,8 +118,8 @@ tup() failed.\n"); > return -ENOMEM; > } > @@ -261,7 +261,7 @@ static int __init hp300_8250_init(void) -> line =3D serial8250_register_8250_port(&uart); -> =20 +> line = serial8250_register_8250_port(&uart); +> > if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: register_serial() APCI" > + pr_notice("8250_hp300: register_serial() APCI" @@ -145,20 +131,17 @@ Missed these multi-line strings in your previous patch > kfree(port); > continue; -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 2731031..3811c67 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c -> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struc= -t pnp_device_id *dev_id) +> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) > return -ENODEV; -> =20 +> > #ifdef SERIAL_DEBUG_PNP > - printk(KERN_DEBUG > - "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", -> - uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.po= -rt.iotype); +> - uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype); > + pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", > + uart.port.iobase, uart.port.mapbase, > + uart.port.irq, uart.port.iotype); @@ -169,27 +152,24 @@ you should note what the behavioral difference is in the changelog. > #endif > if (flags & CIR_PORT) { -> uart.port.flags |=3D UPF_FIXED_PORT | UPF_FIXED_TYPE; -> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial= -/8250/8250_port.c +> uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE; +> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c > index 0ec823e..1b2aaf9 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c -> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *u= -p) +> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up) > out_lock: > spin_unlock_irqrestore(&port->lock, flags); -> if (up->capabilities !=3D old_capabilities) { +> if (up->capabilities != old_capabilities) { > - printk(KERN_WARNING > - "ttyS%d: detected caps %08x should be %08x\n", > + pr_warn("ttyS%d: detected caps %08x should be %08x\n", > serial_index(port), old_capabilities, > up->capabilities); > } ->=20 +> -- -To unsubscribe from this list: send the line "unsubscribe linux-parisc"= - in +To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9116dd6..b460a76 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,19 +26,18 @@ linux-kernel@vger.kernel.org linux-parisc@vger.kernel.org linux-kernel@i4.cs.fau.de - " Phillip Raffeck <phillip.raffe\0" + " Phillip Raffeck <phillip.raffe>\0" "\00:1\0" "b\0" "Hi Anton,\n" "\n" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" - "> This patch replaces printk by the corresponding variant of pr_* in or=\n" - "der to\n" + "> This patch replaces printk by the corresponding variant of pr_* in order to\n" "> fix checkpatch warnings.\n" "\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" @@ -48,45 +47,40 @@ "> drivers/tty/serial/8250/8250_pnp.c | 6 +++---\n" "> drivers/tty/serial/8250/8250_port.c | 3 +--\n" "> 5 files changed, 15 insertions(+), 19 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=\n" - "/8250/8250_core.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c\n" "> index 2b3731f..b5e0c48 100644\n" "> --- a/drivers/tty/serial/8250/8250_core.c\n" "> +++ b/drivers/tty/serial/8250/8250_core.c\n" "> @@ -1095,9 +1095,8 @@ static int __init serial8250_init(void)\n" - "> =20\n" + "> \n" "> \tserial8250_isa_init_ports();\n" - "> =20\n" + "> \n" "> -\tprintk(KERN_INFO \"Serial: 8250/16550 driver, \"\n" "> -\t\t\"%d ports, IRQ sharing %sabled\\n\", nr_uarts,\n" "> -\t\tshare_irqs ? \"en\" : \"dis\");\n" - "> +\tpr_info(\"Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\\n=\n" - "\",\n" + "> +\tpr_info(\"Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\\n\",\n" "> +\t\tnr_uarts, share_irqs ? \"en\" : \"dis\");\n" - "> =20\n" + "> \n" "> #ifdef CONFIG_SPARC\n" - "> \tret =3D sunserial_register_minors(&serial8250_reg, UART_NR);\n" - "> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/=\n" - "8250/8250_gsc.c\n" + "> \tret = sunserial_register_minors(&serial8250_reg, UART_NR);\n" + "> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c\n" "> index 2e3ea1a..a9b63d0 100644\n" "> --- a/drivers/tty/serial/8250/8250_gsc.c\n" "> +++ b/drivers/tty/serial/8250/8250_gsc.c\n" - "> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_de=\n" - "vice *dev)\n" + "> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev)\n" "> \t\t * the user what they're missing.\n" "> \t\t */\n" - "> \t\tif (parisc_parent(dev)->id.hw_type !=3D HPHW_IOA)\n" + "> \t\tif (parisc_parent(dev)->id.hw_type != HPHW_IOA)\n" "> -\t\t\tprintk(KERN_INFO\n" "> -\t\t\t\t\"Serial: device 0x%llx not configured.\\n\"\n" "> +\t\t\tpr_info(\"Serial: device 0x%llx not configured.\\n\"\n" "> \t\t\t\t\"Enable support for Wax, Lasi, Asp or Dino.\\n\",\n" "> \t\t\t\t(unsigned long long)dev->hpa.start);\n" "> \t\treturn -ENODEV;\n" - "> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_de=\n" - "vice *dev)\n" - "> =20\n" - "> \terr =3D serial8250_register_8250_port(&uart);\n" + "> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev)\n" + "> \n" + "> \terr = serial8250_register_8250_port(&uart);\n" "> \tif (err < 0) {\n" "> -\t\tprintk(KERN_WARNING\n" "> -\t\t\t\"serial8250_register_8250_port returned error %d\\n\", err);\n" @@ -94,58 +88,50 @@ "> \t\tiounmap(uart.port.membase);\n" "> \t\treturn err;\n" "> \t}\n" - "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=\n" - "l/8250/8250_hp300.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c\n" "> index 52c43da..85b574896 100644\n" "> --- a/drivers/tty/serial/8250/8250_hp300.c\n" "> +++ b/drivers/tty/serial/8250/8250_hp300.c\n" "> @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void)\n" "> \t/* Check for APCI console */\n" - "> \tif (scode =3D=3D 256) {\n" + "> \tif (scode == 256) {\n" "> #ifdef CONFIG_HPAPCI\n" "> -\t\tprintk(KERN_INFO \"Serial console is HP APCI 1\\n\");\n" "> +\t\tpr_info(\"Serial console is HP APCI 1\\n\");\n" - "> =20\n" - "> \t\tport.uartclk =3D HPAPCI_BAUD_BASE * 16;\n" - "> \t\tport.mapbase =3D (FRODO_BASE + FRODO_APCI_OFFSET(1));\n" + "> \n" + "> \t\tport.uartclk = HPAPCI_BAUD_BASE * 16;\n" + "> \t\tport.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));\n" "> @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void)\n" - "> \t\tport.regshift =3D 2;\n" + "> \t\tport.regshift = 2;\n" "> \t\tadd_preferred_console(\"ttyS\", port.line, \"9600n8\");\n" "> #else\n" - "> -\t\tprintk(KERN_WARNING \"Serial console is APCI but support is disable=\n" - "d (CONFIG_HPAPCI)!\\n\");\n" - "> +\t\tpr_warn(\"Serial console is APCI but support is disabled (CONFIG_HP=\n" - "APCI)!\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\\n\");\n" + "> +\t\tpr_warn(\"Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\\n\");\n" "> \t\treturn 0;\n" "> #endif\n" "> \t} else {\n" "> @@ -128,7 +128,7 @@ int __init hp300_setup_serial_console(void)\n" "> \t\tif (!pa)\n" "> \t\t\treturn 0;\n" - "> =20\n" - "> -\t\tprintk(KERN_INFO \"Serial console is HP DCA at select code %d\\n\", s=\n" - "code);\n" + "> \n" + "> -\t\tprintk(KERN_INFO \"Serial console is HP DCA at select code %d\\n\", scode);\n" "> +\t\tpr_info(\"Serial console is HP DCA at select code %d\\n\", scode);\n" - "> =20\n" - "> \t\tport.uartclk =3D HPDCA_BAUD_BASE * 16;\n" - "> \t\tport.mapbase =3D (pa + UART_OFFSET);\n" + "> \n" + "> \t\tport.uartclk = HPDCA_BAUD_BASE * 16;\n" + "> \t\tport.mapbase = (pa + UART_OFFSET);\n" "> @@ -142,13 +142,13 @@ int __init hp300_setup_serial_console(void)\n" "> \t\tif (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)\n" "> \t\t\tadd_preferred_console(\"ttyS\", port.line, \"9600n8\");\n" "> #else\n" - "> -\t\tprintk(KERN_WARNING \"Serial console is DCA but support is disabled=\n" - " (CONFIG_HPDCA)!\\n\");\n" - "> +\t\tpr_warn(\"Serial console is DCA but support is disabled (CONFIG_HPD=\n" - "CA)!\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"Serial console is DCA but support is disabled (CONFIG_HPDCA)!\\n\");\n" + "> +\t\tpr_warn(\"Serial console is DCA but support is disabled (CONFIG_HPDCA)!\\n\");\n" "> \t\treturn 0;\n" "> #endif\n" "> \t}\n" - "> =20\n" + "> \n" "> \tif (early_serial_setup(&port) < 0)\n" - "> -\t\tprintk(KERN_WARNING \"hp300_setup_serial_console(): early_serial_se=\n" - "tup() failed.\\n\");\n" - "> +\t\tpr_warn(\"hp300_setup_serial_console(): early_serial_setup() failed=\n" - "=2E\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"hp300_setup_serial_console(): early_serial_setup() failed.\\n\");\n" + "> +\t\tpr_warn(\"hp300_setup_serial_console(): early_serial_setup() failed.\\n\");\n" "> \treturn 0;\n" "> }\n" "> #endif /* CONFIG_SERIAL_8250_CONSOLE */\n" @@ -154,8 +140,8 @@ "\n" "\n" "> @@ -180,7 +180,7 @@ static int hpdca_init_one(struct dio_dev *d,\n" - "> \tline =3D serial8250_register_8250_port(&uart);\n" - "> =20\n" + "> \tline = serial8250_register_8250_port(&uart);\n" + "> \n" "> \tif (line < 0) {\n" "> -\t\tprintk(KERN_NOTICE \"8250_hp300: register_serial() DCA scode %d\"\n" "> +\t\tpr_notice(\"8250_hp300: register_serial() DCA scode %d\"\n" @@ -163,8 +149,8 @@ "> \t\treturn -ENOMEM;\n" "> \t}\n" "> @@ -261,7 +261,7 @@ static int __init hp300_8250_init(void)\n" - "> \t\tline =3D serial8250_register_8250_port(&uart);\n" - "> =20\n" + "> \t\tline = serial8250_register_8250_port(&uart);\n" + "> \n" "> \t\tif (line < 0) {\n" "> -\t\t\tprintk(KERN_NOTICE \"8250_hp300: register_serial() APCI\"\n" "> +\t\t\tpr_notice(\"8250_hp300: register_serial() APCI\"\n" @@ -176,20 +162,17 @@ "\n" "> \t\t\tkfree(port);\n" "> \t\t\tcontinue;\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 2731031..3811c67 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" - "> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struc=\n" - "t pnp_device_id *dev_id)\n" + "> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)\n" "> \t\treturn -ENODEV;\n" - "> =20\n" + "> \n" "> #ifdef SERIAL_DEBUG_PNP\n" "> -\tprintk(KERN_DEBUG\n" "> -\t\t\"Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\\n\",\n" - "> -\t\t uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.po=\n" - "rt.iotype);\n" + "> -\t\t uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype);\n" "> +\tpr_debug(\"Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\\n\",\n" "> +\t\t uart.port.iobase, uart.port.mapbase,\n" "> +\t\t uart.port.irq, uart.port.iotype);\n" @@ -200,29 +183,26 @@ "\n" "> #endif\n" "> \tif (flags & CIR_PORT) {\n" - "> \t\tuart.port.flags |=3D UPF_FIXED_PORT | UPF_FIXED_TYPE;\n" - "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial=\n" - "/8250/8250_port.c\n" + "> \t\tuart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;\n" + "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c\n" "> index 0ec823e..1b2aaf9 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" - "> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *u=\n" - "p)\n" + "> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up)\n" "> out_lock:\n" "> \tspin_unlock_irqrestore(&port->lock, flags);\n" - "> \tif (up->capabilities !=3D old_capabilities) {\n" + "> \tif (up->capabilities != old_capabilities) {\n" "> -\t\tprintk(KERN_WARNING\n" "> -\t\t \"ttyS%d: detected caps %08x should be %08x\\n\",\n" "> +\t\tpr_warn(\"ttyS%d: detected caps %08x should be %08x\\n\",\n" "> \t\t serial_index(port), old_capabilities,\n" "> \t\t up->capabilities);\n" "> \t}\n" - ">=20\n" + "> \n" "\n" "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\"=\n" - " in\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\" in\n" "the body of a message to majordomo@vger.kernel.org\n" More majordomo info at http://vger.kernel.org/majordomo-info.html -c76e0bc6cb7c32be130238f7b48ea0c158697c61708fae376be5fdbf5035d295 +b96abf9767870077a2ac3b0d3a8c3449d8120281f40ea50b8f47fed7b7e895a0
diff --git a/a/1.txt b/N2/1.txt index 01e9de1..6e7b86d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,13 +1,12 @@ Hi Anton, On 12/16/2015 07:36 AM, Anton Wuerfel wrote: -> This patch replaces printk by the corresponding variant of pr_* in or= -der to +> This patch replaces printk by the corresponding variant of pr_* in order to > fix checkpatch warnings. 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 > --- @@ -17,45 +16,40 @@ Comments below. > drivers/tty/serial/8250/8250_pnp.c | 6 +++--- > drivers/tty/serial/8250/8250_port.c | 3 +-- > 5 files changed, 15 insertions(+), 19 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial= -/8250/8250_core.c +> +> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c > index 2b3731f..b5e0c48 100644 > --- a/drivers/tty/serial/8250/8250_core.c > +++ b/drivers/tty/serial/8250/8250_core.c > @@ -1095,9 +1095,8 @@ static int __init serial8250_init(void) -> =20 +> > serial8250_isa_init_ports(); -> =20 +> > - printk(KERN_INFO "Serial: 8250/16550 driver, " > - "%d ports, IRQ sharing %sabled\n", nr_uarts, > - share_irqs ? "en" : "dis"); -> + pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n= -", +> + pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n", > + nr_uarts, share_irqs ? "en" : "dis"); -> =20 +> > #ifdef CONFIG_SPARC -> ret =3D sunserial_register_minors(&serial8250_reg, UART_NR); -> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/= -8250/8250_gsc.c +> ret = sunserial_register_minors(&serial8250_reg, UART_NR); +> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c > index 2e3ea1a..a9b63d0 100644 > --- a/drivers/tty/serial/8250/8250_gsc.c > +++ b/drivers/tty/serial/8250/8250_gsc.c -> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_de= -vice *dev) +> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev) > * the user what they're missing. > */ -> if (parisc_parent(dev)->id.hw_type !=3D HPHW_IOA) +> if (parisc_parent(dev)->id.hw_type != HPHW_IOA) > - printk(KERN_INFO > - "Serial: device 0x%llx not configured.\n" > + pr_info("Serial: device 0x%llx not configured.\n" > "Enable support for Wax, Lasi, Asp or Dino.\n", > (unsigned long long)dev->hpa.start); > return -ENODEV; -> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_de= -vice *dev) -> =20 -> err =3D serial8250_register_8250_port(&uart); +> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev) +> +> err = serial8250_register_8250_port(&uart); > if (err < 0) { > - printk(KERN_WARNING > - "serial8250_register_8250_port returned error %d\n", err); @@ -63,58 +57,50 @@ vice *dev) > iounmap(uart.port.membase); > return err; > } -> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria= -l/8250/8250_hp300.c +> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c > index 52c43da..85b574896 100644 > --- a/drivers/tty/serial/8250/8250_hp300.c > +++ b/drivers/tty/serial/8250/8250_hp300.c > @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void) > /* Check for APCI console */ -> if (scode =3D=3D 256) { +> if (scode == 256) { > #ifdef CONFIG_HPAPCI > - printk(KERN_INFO "Serial console is HP APCI 1\n"); > + pr_info("Serial console is HP APCI 1\n"); -> =20 -> port.uartclk =3D HPAPCI_BAUD_BASE * 16; -> port.mapbase =3D (FRODO_BASE + FRODO_APCI_OFFSET(1)); +> +> port.uartclk = HPAPCI_BAUD_BASE * 16; +> port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1)); > @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void) -> port.regshift =3D 2; +> port.regshift = 2; > add_preferred_console("ttyS", port.line, "9600n8"); > #else -> - printk(KERN_WARNING "Serial console is APCI but support is disable= -d (CONFIG_HPAPCI)!\n"); -> + pr_warn("Serial console is APCI but support is disabled (CONFIG_HP= -APCI)!\n"); +> - printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); +> + pr_warn("Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n"); > return 0; > #endif > } else { > @@ -128,7 +128,7 @@ int __init hp300_setup_serial_console(void) > if (!pa) > return 0; -> =20 -> - printk(KERN_INFO "Serial console is HP DCA at select code %d\n", s= -code); +> +> - printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode); > + pr_info("Serial console is HP DCA at select code %d\n", scode); -> =20 -> port.uartclk =3D HPDCA_BAUD_BASE * 16; -> port.mapbase =3D (pa + UART_OFFSET); +> +> port.uartclk = HPDCA_BAUD_BASE * 16; +> port.mapbase = (pa + UART_OFFSET); > @@ -142,13 +142,13 @@ int __init hp300_setup_serial_console(void) > if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) > add_preferred_console("ttyS", port.line, "9600n8"); > #else -> - printk(KERN_WARNING "Serial console is DCA but support is disabled= - (CONFIG_HPDCA)!\n"); -> + pr_warn("Serial console is DCA but support is disabled (CONFIG_HPD= -CA)!\n"); +> - printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); +> + pr_warn("Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n"); > return 0; > #endif > } -> =20 +> > if (early_serial_setup(&port) < 0) -> - printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_se= -tup() failed.\n"); -> + pr_warn("hp300_setup_serial_console(): early_serial_setup() failed= -=2E\n"); +> - printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n"); +> + pr_warn("hp300_setup_serial_console(): early_serial_setup() failed.\n"); > return 0; > } > #endif /* CONFIG_SERIAL_8250_CONSOLE */ @@ -123,8 +109,8 @@ tup() failed.\n"); > @@ -180,7 +180,7 @@ static int hpdca_init_one(struct dio_dev *d, -> line =3D serial8250_register_8250_port(&uart); -> =20 +> line = serial8250_register_8250_port(&uart); +> > if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d" > + pr_notice("8250_hp300: register_serial() DCA scode %d" @@ -132,8 +118,8 @@ tup() failed.\n"); > return -ENOMEM; > } > @@ -261,7 +261,7 @@ static int __init hp300_8250_init(void) -> line =3D serial8250_register_8250_port(&uart); -> =20 +> line = serial8250_register_8250_port(&uart); +> > if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: register_serial() APCI" > + pr_notice("8250_hp300: register_serial() APCI" @@ -145,20 +131,17 @@ Missed these multi-line strings in your previous patch > kfree(port); > continue; -> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/= -8250/8250_pnp.c +> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c > index 2731031..3811c67 100644 > --- a/drivers/tty/serial/8250/8250_pnp.c > +++ b/drivers/tty/serial/8250/8250_pnp.c -> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struc= -t pnp_device_id *dev_id) +> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) > return -ENODEV; -> =20 +> > #ifdef SERIAL_DEBUG_PNP > - printk(KERN_DEBUG > - "Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", -> - uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.po= -rt.iotype); +> - uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype); > + pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n", > + uart.port.iobase, uart.port.mapbase, > + uart.port.irq, uart.port.iotype); @@ -169,27 +152,19 @@ you should note what the behavioral difference is in the changelog. > #endif > if (flags & CIR_PORT) { -> uart.port.flags |=3D UPF_FIXED_PORT | UPF_FIXED_TYPE; -> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial= -/8250/8250_port.c +> uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE; +> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c > index 0ec823e..1b2aaf9 100644 > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c -> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *u= -p) +> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up) > out_lock: > spin_unlock_irqrestore(&port->lock, flags); -> if (up->capabilities !=3D old_capabilities) { +> if (up->capabilities != old_capabilities) { > - printk(KERN_WARNING > - "ttyS%d: detected caps %08x should be %08x\n", > + pr_warn("ttyS%d: detected caps %08x should be %08x\n", > serial_index(port), old_capabilities, > up->capabilities); > } ->=20 - --- -To unsubscribe from this list: send the line "unsubscribe linux-parisc"= - in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +> diff --git a/a/content_digest b/N2/content_digest index 9116dd6..9c00a08 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -26,19 +26,18 @@ linux-kernel@vger.kernel.org linux-parisc@vger.kernel.org linux-kernel@i4.cs.fau.de - " Phillip Raffeck <phillip.raffe\0" + " Phillip Raffeck <phillip.raffeck@fau.de>\0" "\00:1\0" "b\0" "Hi Anton,\n" "\n" "On 12/16/2015 07:36 AM, Anton Wuerfel wrote:\n" - "> This patch replaces printk by the corresponding variant of pr_* in or=\n" - "der to\n" + "> This patch replaces printk by the corresponding variant of pr_* in order to\n" "> fix checkpatch warnings.\n" "\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" @@ -48,45 +47,40 @@ "> drivers/tty/serial/8250/8250_pnp.c | 6 +++---\n" "> drivers/tty/serial/8250/8250_port.c | 3 +--\n" "> 5 files changed, 15 insertions(+), 19 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial=\n" - "/8250/8250_core.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c\n" "> index 2b3731f..b5e0c48 100644\n" "> --- a/drivers/tty/serial/8250/8250_core.c\n" "> +++ b/drivers/tty/serial/8250/8250_core.c\n" "> @@ -1095,9 +1095,8 @@ static int __init serial8250_init(void)\n" - "> =20\n" + "> \n" "> \tserial8250_isa_init_ports();\n" - "> =20\n" + "> \n" "> -\tprintk(KERN_INFO \"Serial: 8250/16550 driver, \"\n" "> -\t\t\"%d ports, IRQ sharing %sabled\\n\", nr_uarts,\n" "> -\t\tshare_irqs ? \"en\" : \"dis\");\n" - "> +\tpr_info(\"Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\\n=\n" - "\",\n" + "> +\tpr_info(\"Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\\n\",\n" "> +\t\tnr_uarts, share_irqs ? \"en\" : \"dis\");\n" - "> =20\n" + "> \n" "> #ifdef CONFIG_SPARC\n" - "> \tret =3D sunserial_register_minors(&serial8250_reg, UART_NR);\n" - "> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/=\n" - "8250/8250_gsc.c\n" + "> \tret = sunserial_register_minors(&serial8250_reg, UART_NR);\n" + "> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c\n" "> index 2e3ea1a..a9b63d0 100644\n" "> --- a/drivers/tty/serial/8250/8250_gsc.c\n" "> +++ b/drivers/tty/serial/8250/8250_gsc.c\n" - "> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_de=\n" - "vice *dev)\n" + "> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev)\n" "> \t\t * the user what they're missing.\n" "> \t\t */\n" - "> \t\tif (parisc_parent(dev)->id.hw_type !=3D HPHW_IOA)\n" + "> \t\tif (parisc_parent(dev)->id.hw_type != HPHW_IOA)\n" "> -\t\t\tprintk(KERN_INFO\n" "> -\t\t\t\t\"Serial: device 0x%llx not configured.\\n\"\n" "> +\t\t\tpr_info(\"Serial: device 0x%llx not configured.\\n\"\n" "> \t\t\t\t\"Enable support for Wax, Lasi, Asp or Dino.\\n\",\n" "> \t\t\t\t(unsigned long long)dev->hpa.start);\n" "> \t\treturn -ENODEV;\n" - "> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_de=\n" - "vice *dev)\n" - "> =20\n" - "> \terr =3D serial8250_register_8250_port(&uart);\n" + "> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev)\n" + "> \n" + "> \terr = serial8250_register_8250_port(&uart);\n" "> \tif (err < 0) {\n" "> -\t\tprintk(KERN_WARNING\n" "> -\t\t\t\"serial8250_register_8250_port returned error %d\\n\", err);\n" @@ -94,58 +88,50 @@ "> \t\tiounmap(uart.port.membase);\n" "> \t\treturn err;\n" "> \t}\n" - "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/seria=\n" - "l/8250/8250_hp300.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c\n" "> index 52c43da..85b574896 100644\n" "> --- a/drivers/tty/serial/8250/8250_hp300.c\n" "> +++ b/drivers/tty/serial/8250/8250_hp300.c\n" "> @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void)\n" "> \t/* Check for APCI console */\n" - "> \tif (scode =3D=3D 256) {\n" + "> \tif (scode == 256) {\n" "> #ifdef CONFIG_HPAPCI\n" "> -\t\tprintk(KERN_INFO \"Serial console is HP APCI 1\\n\");\n" "> +\t\tpr_info(\"Serial console is HP APCI 1\\n\");\n" - "> =20\n" - "> \t\tport.uartclk =3D HPAPCI_BAUD_BASE * 16;\n" - "> \t\tport.mapbase =3D (FRODO_BASE + FRODO_APCI_OFFSET(1));\n" + "> \n" + "> \t\tport.uartclk = HPAPCI_BAUD_BASE * 16;\n" + "> \t\tport.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));\n" "> @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void)\n" - "> \t\tport.regshift =3D 2;\n" + "> \t\tport.regshift = 2;\n" "> \t\tadd_preferred_console(\"ttyS\", port.line, \"9600n8\");\n" "> #else\n" - "> -\t\tprintk(KERN_WARNING \"Serial console is APCI but support is disable=\n" - "d (CONFIG_HPAPCI)!\\n\");\n" - "> +\t\tpr_warn(\"Serial console is APCI but support is disabled (CONFIG_HP=\n" - "APCI)!\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\\n\");\n" + "> +\t\tpr_warn(\"Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\\n\");\n" "> \t\treturn 0;\n" "> #endif\n" "> \t} else {\n" "> @@ -128,7 +128,7 @@ int __init hp300_setup_serial_console(void)\n" "> \t\tif (!pa)\n" "> \t\t\treturn 0;\n" - "> =20\n" - "> -\t\tprintk(KERN_INFO \"Serial console is HP DCA at select code %d\\n\", s=\n" - "code);\n" + "> \n" + "> -\t\tprintk(KERN_INFO \"Serial console is HP DCA at select code %d\\n\", scode);\n" "> +\t\tpr_info(\"Serial console is HP DCA at select code %d\\n\", scode);\n" - "> =20\n" - "> \t\tport.uartclk =3D HPDCA_BAUD_BASE * 16;\n" - "> \t\tport.mapbase =3D (pa + UART_OFFSET);\n" + "> \n" + "> \t\tport.uartclk = HPDCA_BAUD_BASE * 16;\n" + "> \t\tport.mapbase = (pa + UART_OFFSET);\n" "> @@ -142,13 +142,13 @@ int __init hp300_setup_serial_console(void)\n" "> \t\tif (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)\n" "> \t\t\tadd_preferred_console(\"ttyS\", port.line, \"9600n8\");\n" "> #else\n" - "> -\t\tprintk(KERN_WARNING \"Serial console is DCA but support is disabled=\n" - " (CONFIG_HPDCA)!\\n\");\n" - "> +\t\tpr_warn(\"Serial console is DCA but support is disabled (CONFIG_HPD=\n" - "CA)!\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"Serial console is DCA but support is disabled (CONFIG_HPDCA)!\\n\");\n" + "> +\t\tpr_warn(\"Serial console is DCA but support is disabled (CONFIG_HPDCA)!\\n\");\n" "> \t\treturn 0;\n" "> #endif\n" "> \t}\n" - "> =20\n" + "> \n" "> \tif (early_serial_setup(&port) < 0)\n" - "> -\t\tprintk(KERN_WARNING \"hp300_setup_serial_console(): early_serial_se=\n" - "tup() failed.\\n\");\n" - "> +\t\tpr_warn(\"hp300_setup_serial_console(): early_serial_setup() failed=\n" - "=2E\\n\");\n" + "> -\t\tprintk(KERN_WARNING \"hp300_setup_serial_console(): early_serial_setup() failed.\\n\");\n" + "> +\t\tpr_warn(\"hp300_setup_serial_console(): early_serial_setup() failed.\\n\");\n" "> \treturn 0;\n" "> }\n" "> #endif /* CONFIG_SERIAL_8250_CONSOLE */\n" @@ -154,8 +140,8 @@ "\n" "\n" "> @@ -180,7 +180,7 @@ static int hpdca_init_one(struct dio_dev *d,\n" - "> \tline =3D serial8250_register_8250_port(&uart);\n" - "> =20\n" + "> \tline = serial8250_register_8250_port(&uart);\n" + "> \n" "> \tif (line < 0) {\n" "> -\t\tprintk(KERN_NOTICE \"8250_hp300: register_serial() DCA scode %d\"\n" "> +\t\tpr_notice(\"8250_hp300: register_serial() DCA scode %d\"\n" @@ -163,8 +149,8 @@ "> \t\treturn -ENOMEM;\n" "> \t}\n" "> @@ -261,7 +261,7 @@ static int __init hp300_8250_init(void)\n" - "> \t\tline =3D serial8250_register_8250_port(&uart);\n" - "> =20\n" + "> \t\tline = serial8250_register_8250_port(&uart);\n" + "> \n" "> \t\tif (line < 0) {\n" "> -\t\t\tprintk(KERN_NOTICE \"8250_hp300: register_serial() APCI\"\n" "> +\t\t\tpr_notice(\"8250_hp300: register_serial() APCI\"\n" @@ -176,20 +162,17 @@ "\n" "> \t\t\tkfree(port);\n" "> \t\t\tcontinue;\n" - "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/=\n" - "8250/8250_pnp.c\n" + "> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c\n" "> index 2731031..3811c67 100644\n" "> --- a/drivers/tty/serial/8250/8250_pnp.c\n" "> +++ b/drivers/tty/serial/8250/8250_pnp.c\n" - "> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struc=\n" - "t pnp_device_id *dev_id)\n" + "> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)\n" "> \t\treturn -ENODEV;\n" - "> =20\n" + "> \n" "> #ifdef SERIAL_DEBUG_PNP\n" "> -\tprintk(KERN_DEBUG\n" "> -\t\t\"Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\\n\",\n" - "> -\t\t uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.po=\n" - "rt.iotype);\n" + "> -\t\t uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype);\n" "> +\tpr_debug(\"Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\\n\",\n" "> +\t\t uart.port.iobase, uart.port.mapbase,\n" "> +\t\t uart.port.irq, uart.port.iotype);\n" @@ -200,29 +183,21 @@ "\n" "> #endif\n" "> \tif (flags & CIR_PORT) {\n" - "> \t\tuart.port.flags |=3D UPF_FIXED_PORT | UPF_FIXED_TYPE;\n" - "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial=\n" - "/8250/8250_port.c\n" + "> \t\tuart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;\n" + "> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c\n" "> index 0ec823e..1b2aaf9 100644\n" "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" - "> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *u=\n" - "p)\n" + "> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up)\n" "> out_lock:\n" "> \tspin_unlock_irqrestore(&port->lock, flags);\n" - "> \tif (up->capabilities !=3D old_capabilities) {\n" + "> \tif (up->capabilities != old_capabilities) {\n" "> -\t\tprintk(KERN_WARNING\n" "> -\t\t \"ttyS%d: detected caps %08x should be %08x\\n\",\n" "> +\t\tpr_warn(\"ttyS%d: detected caps %08x should be %08x\\n\",\n" "> \t\t serial_index(port), old_capabilities,\n" "> \t\t up->capabilities);\n" "> \t}\n" - ">=20\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-parisc\"=\n" - " in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + > -c76e0bc6cb7c32be130238f7b48ea0c158697c61708fae376be5fdbf5035d295 +d119866732bf60db35e1f747b0056b8444c428d803094674e03a46e5d22f38ea
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.