diff for duplicates of <1452515914.26146.14.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index a2f19c9..0ed46fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,78 +1,70 @@ On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote: > From: Phillip Raffeck <phillip.raffeck@fau.de> ->=20 +> > This patch replaces printk by the corresponding variant of dev_* in > order > to fix checkpatch warnings. If no suitable device pointer is present, > the > corresponding pr_* variant is used. ->=20 +> > --- a/drivers/tty/serial/8250/8250_hp300.c > +++ b/drivers/tty/serial/8250/8250_hp300.c ->=20 +> > @@ -141,13 +141,13 @@ int __init hp300_setup_serial_console(void) -> =C2=A0 if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) -> =C2=A0 add_preferred_console("ttyS", port.line, +> if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80) +> add_preferred_console("ttyS", port.line, > "9600n8"); -> =C2=A0#else +> #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_HPDCA)!\n"); -> =C2=A0 return 0; -> =C2=A0#endif -> =C2=A0 } -> =C2=A0 -> =C2=A0 if (early_serial_setup(&port) < 0) +> return 0; +> #endif +> } +> +> if (early_serial_setup(&port) < 0) > - printk(KERN_WARNING "hp300_setup_serial_console(): > early_serial_setup() failed.\n"); > + pr_warn("hp300_setup_serial_console(): > early_serial_setup() failed.\n"); -%s:=E2=80=A6, __func__ ? +%s:…, __func__ ? -> =C2=A0 return 0; -> =C2=A0} -> =C2=A0#endif /* CONFIG_SERIAL_8250_CONSOLE */ +> return 0; +> } +> #endif /* CONFIG_SERIAL_8250_CONSOLE */ > @@ -179,8 +179,9 @@ static int hpdca_init_one(struct dio_dev *d, -> =C2=A0 line =3D serial8250_register_8250_port(&uart); -> =C2=A0 -> =C2=A0 if (line < 0) { +> line = serial8250_register_8250_port(&uart); +> +> if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: register_serial() > DCA scode %d" -> - =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0" irq %d failed\n", d->s= -code, uart.port.irq); +> - " irq %d failed\n", d->scode, uart.port.irq); > + dev_notice(&d->dev, -> + =C2=A0=C2=A0"8250_hp300: register_serial() DCA scode +> + "8250_hp300: register_serial() DCA scode > %d irq %d failed\n", -> + =C2=A0=C2=A0d->scode, uart.port.irq); -> =C2=A0 return -ENOMEM; -> =C2=A0 } -> =C2=A0 +> + d->scode, uart.port.irq); +> return -ENOMEM; +> } +> > @@ -260,8 +261,8 @@ static int __init hp300_8250_init(void) -> =C2=A0 line =3D serial8250_register_8250_port(&uart); -> =C2=A0 -> =C2=A0 if (line < 0) { +> line = serial8250_register_8250_port(&uart); +> +> if (line < 0) { > - printk(KERN_NOTICE "8250_hp300: > register_serial() APCI" -> - =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0" %d irq %d failed\n", = -i, +> - " %d irq %d failed\n", i, > uart.port.irq); > + pr_notice("8250_hp300: register_serial() > APCI %d irq %d failed\n", -> + =C2=A0=C2=A0i, uart.port.irq); +> + i, uart.port.irq); Inconsistent with dev_notice() above. Choose one which is most suitable here. ---=20 +-- Andy Shevchenko <andriy.shevchenko@linux.intel.com> Intel Finland Oy - --- -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 574dbb6..4142be1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -30,81 +30,73 @@ "b\0" "On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote:\n" "> From: Phillip Raffeck <phillip.raffeck@fau.de>\n" - ">=20\n" + "> \n" "> This patch replaces printk by the corresponding variant of dev_* in\n" "> order\n" "> to fix checkpatch warnings. If no suitable device pointer is present,\n" "> the\n" "> corresponding pr_* variant is used.\n" - ">=20\n" + "> \n" "\n" "> --- a/drivers/tty/serial/8250/8250_hp300.c\n" "> +++ b/drivers/tty/serial/8250/8250_hp300.c\n" - ">=20\n" + "> \n" "\n" "> @@ -141,13 +141,13 @@ int __init hp300_setup_serial_console(void)\n" - "> =C2=A0\t\tif (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)\n" - "> =C2=A0\t\t\tadd_preferred_console(\"ttyS\", port.line,\n" + "> \302\240\t\tif (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)\n" + "> \302\240\t\t\tadd_preferred_console(\"ttyS\", port.line,\n" "> \"9600n8\");\n" - "> =C2=A0#else\n" + "> \302\240#else\n" "> -\t\tprintk(KERN_WARNING \"Serial console is DCA but\n" "> support is disabled (CONFIG_HPDCA)!\\n\");\n" "> +\t\tpr_warn(\"Serial console is DCA but support is\n" "> disabled (CONFIG_HPDCA)!\\n\");\n" - "> =C2=A0\t\treturn 0;\n" - "> =C2=A0#endif\n" - "> =C2=A0\t}\n" - "> =C2=A0\n" - "> =C2=A0\tif (early_serial_setup(&port) < 0)\n" + "> \302\240\t\treturn 0;\n" + "> \302\240#endif\n" + "> \302\240\t}\n" + "> \302\240\n" + "> \302\240\tif (early_serial_setup(&port) < 0)\n" "> -\t\tprintk(KERN_WARNING \"hp300_setup_serial_console():\n" "> early_serial_setup() failed.\\n\");\n" "> +\t\tpr_warn(\"hp300_setup_serial_console():\n" "> early_serial_setup() failed.\\n\");\n" "\n" - "%s:=E2=80=A6, __func__ ?\n" + "%s:\342\200\246, __func__ ?\n" "\n" - "> =C2=A0\treturn 0;\n" - "> =C2=A0}\n" - "> =C2=A0#endif /* CONFIG_SERIAL_8250_CONSOLE */\n" + "> \302\240\treturn 0;\n" + "> \302\240}\n" + "> \302\240#endif /* CONFIG_SERIAL_8250_CONSOLE */\n" "> @@ -179,8 +179,9 @@ static int hpdca_init_one(struct dio_dev *d,\n" - "> =C2=A0\tline =3D serial8250_register_8250_port(&uart);\n" - "> =C2=A0\n" - "> =C2=A0\tif (line < 0) {\n" + "> \302\240\tline = serial8250_register_8250_port(&uart);\n" + "> \302\240\n" + "> \302\240\tif (line < 0) {\n" "> -\t\tprintk(KERN_NOTICE \"8250_hp300: register_serial()\n" "> DCA scode %d\"\n" - "> -\t\t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\" irq %d failed\\n\", d->s=\n" - "code, uart.port.irq);\n" + "> -\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240\" irq %d failed\\n\", d->scode, uart.port.irq);\n" "> +\t\tdev_notice(&d->dev,\n" - "> +\t\t\t=C2=A0=C2=A0\"8250_hp300: register_serial() DCA scode\n" + "> +\t\t\t\302\240\302\240\"8250_hp300: register_serial() DCA scode\n" "> %d irq %d failed\\n\",\n" - "> +\t\t\t=C2=A0=C2=A0d->scode, uart.port.irq);\n" - "> =C2=A0\t\treturn -ENOMEM;\n" - "> =C2=A0\t}\n" - "> =C2=A0\n" + "> +\t\t\t\302\240\302\240d->scode, uart.port.irq);\n" + "> \302\240\t\treturn -ENOMEM;\n" + "> \302\240\t}\n" + "> \302\240\n" "> @@ -260,8 +261,8 @@ static int __init hp300_8250_init(void)\n" - "> =C2=A0\t\tline =3D serial8250_register_8250_port(&uart);\n" - "> =C2=A0\n" - "> =C2=A0\t\tif (line < 0) {\n" + "> \302\240\t\tline = serial8250_register_8250_port(&uart);\n" + "> \302\240\n" + "> \302\240\t\tif (line < 0) {\n" "> -\t\t\tprintk(KERN_NOTICE \"8250_hp300:\n" "> register_serial() APCI\"\n" - "> -\t\t\t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0\" %d irq %d failed\\n\", =\n" - "i,\n" + "> -\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\240\" %d irq %d failed\\n\", i,\n" "> uart.port.irq);\n" "> +\t\t\tpr_notice(\"8250_hp300: register_serial()\n" "> APCI %d irq %d failed\\n\",\n" - "> +\t\t\t\t=C2=A0=C2=A0i, uart.port.irq);\n" + "> +\t\t\t\t\302\240\302\240i, uart.port.irq);\n" "\n" "Inconsistent with dev_notice() above. Choose one which is most suitable\n" "here.\n" "\n" - "--=20\n" + "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" - "Intel Finland Oy\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 + Intel Finland Oy -ed989644e4e4ad173dc55a34cd272e734ecf5d5ab53315ecdf9818f3555277ac +643f6965fbb89a611fc79d8c470eb91fe2560d71c4854cce831a10e1b1095ed5
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.