diff for duplicates of <1452704613.26146.70.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 5bd990f..3cb64a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,59 +1,58 @@ On Wed, 2016-01-13 at 17:39 +0100, Anton Wuerfel wrote: > Checkpatch outputs some warnings about incorrect comment style, > which is fixed by this patch. ->=20 +> > --- a/drivers/tty/serial/8250/8250_ingenic.c > +++ b/drivers/tty/serial/8250/8250_ingenic.c > @@ -152,14 +152,18 @@ static void ingenic_uart_serial_out(struct > uart_port *p, int offset, int value) -> =C2=A0 break; -> =C2=A0 -> =C2=A0 case UART_IER: +> break; +> +> case UART_IER: > - /* Enable receive timeout interrupt with the -> - =C2=A0* receive line status interrupt */ +> - * receive line status interrupt */ > + /* -> + =C2=A0* Enable receive timeout interrupt with the -> + =C2=A0* receive line status interrupt +> + * Enable receive timeout interrupt with the +> + * receive line status interrupt I'm pretty sure that at least one word could fit previous line. Can you re-check your patches with sane editor setting for line breaking (like 76 characters)? -> + =C2=A0*/ -> =C2=A0 value |=3D (value & 0x4) << 2; -> =C2=A0 break; -> =C2=A0 -> =C2=A0 case UART_MCR: +> + */ +> value |= (value & 0x4) << 2; +> break; +> +> case UART_MCR: > - /* If we have enabled modem status IRQs we should > enable modem -> - =C2=A0* mode. */ +> - * mode. */ > + /* -> + =C2=A0* If we have enabled modem status IRQs we should +> + * If we have enabled modem status IRQs we should > enable modem -> + =C2=A0* mode. +> + * mode. To check. -> + =C2=A0*/ ->=20 +> + */ +> > @@ -367,8 +367,10 @@ static const struct pnp_device_id -> pnp_dev_table[] =3D { -> =C2=A0 { "PNPCXXX", UNKNOWN_DEV }, -> =C2=A0 /* More unknown PnP modems */ -> =C2=A0 { "PNPDXXX", UNKNOWN_DEV }, +> pnp_dev_table[] = { +> { "PNPCXXX", UNKNOWN_DEV }, +> /* More unknown PnP modems */ +> { "PNPDXXX", UNKNOWN_DEV }, > - /* Winbond CIR port, should not be probed. We should keep > track -> - =C2=A0=C2=A0=C2=A0of it to prevent the legacy serial driver from pr= -obing it +> - of it to prevent the legacy serial driver from probing it > */ > + /* -> + =C2=A0* Winbond CIR port, should not be probed. We should keep +> + * Winbond CIR port, should not be probed. We should keep > track -> + =C2=A0* of it to prevent the legacy serial driver from probing it +> + * of it to prevent the legacy serial driver from probing it I would suggest to add dot at the end of sentences. Here and in the rest of the places. @@ -62,22 +61,21 @@ rest of the places. > --- a/drivers/tty/serial/8250/8250_port.c > +++ b/drivers/tty/serial/8250/8250_port.c > @@ -250,9 +250,11 @@ static const struct serial8250_config -> uart_config[] =3D { -> =C2=A0 .fcr =3D UART_FCR_ENABLE_FIFO | +> uart_config[] = { +> .fcr = UART_FCR_ENABLE_FIFO | > UART_FCR_R_TRIG_10, -> =C2=A0 .flags =3D UART_CAP_FIFO | +> .flags = UART_CAP_FIFO | > UART_CAP_AFE, -> =C2=A0 }, +> }, > -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement -> -workaround of errata A-008006 which states that tx_loadsz should=C2=A0= -=C2=A0be +> -workaround of errata A-008006 which states that tx_loadsz should be > -configured less than Maximum supported fifo bytes */ > + /* -> + =C2=A0* tx_loadsz is set to 63-bytes instead of 64-bytes to +> + * tx_loadsz is set to 63-bytes instead of 64-bytes to > implement -> + =C2=A0* workaround of errata A-008006 which states that tx_loadsz +> + * workaround of errata A-008006 which states that tx_loadsz > should be -> + =C2=A0* configured less than Maximum supported fifo bytes +> + * configured less than Maximum supported fifo bytes Ditto. @@ -85,50 +83,42 @@ Ditto. > +++ b/drivers/tty/serial/8250/serial_cs.c > @@ -441,16 +441,20 @@ static int simple_config(struct pcmcia_device > *link) -> =C2=A0 struct serial_info *info =3D link->priv; -> =C2=A0 int i =3D -ENODEV, try; -> =C2=A0 +> struct serial_info *info = link->priv; +> int i = -ENODEV, try; +> > - /* First pass: look for a config entry that looks normal. -> - =C2=A0* Two tries: without IO aliases, then with aliases */ +> - * Two tries: without IO aliases, then with aliases */ > + /* -> + =C2=A0* First pass: look for a config entry that looks normal. -> + =C2=A0* Two tries: without IO aliases, then with aliases +> + * First pass: look for a config entry that looks normal. +> + * Two tries: without IO aliases, then with aliases Ditto. > @@ -480,8 +484,10 @@ static int multi_config_check(struct > pcmcia_device *p_dev, void *priv_data) -> =C2=A0 if (p_dev->resource[1]->end) -> =C2=A0 return -EINVAL; -> =C2=A0 +> if (p_dev->resource[1]->end) +> return -EINVAL; +> > - /* The quad port cards have bad CIS's, so just look for a -> - =C2=A0=C2=A0=C2=A0window larger than 8 ports and assume it will be = -right */ +> - window larger than 8 ports and assume it will be right */ > + /* -> + =C2=A0* The quad port cards have bad CIS's, so just look for a -> + =C2=A0* window larger than 8 ports and assume it will be right +> + * The quad port cards have bad CIS's, so just look for a +> + * window larger than 8 ports and assume it will be right Ditto. > - /* Another check for dual-serial cards: look for either > serial or -> - =C2=A0=C2=A0=C2=A0multifunction cards that ask for appropriate IO p= -ort +> - multifunction cards that ask for appropriate IO port > ranges */ > + /* -> + =C2=A0* Another check for dual-serial cards: look for either +> + * Another check for dual-serial cards: look for either > serial or -> + =C2=A0* multifunction cards that ask for appropriate IO port +> + * multifunction cards that ask for appropriate IO port > ranges Ditto. ---=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 b43a2ee..cf9fbee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -31,59 +31,58 @@ "On Wed, 2016-01-13 at 17:39 +0100, Anton Wuerfel wrote:\n" "> Checkpatch outputs some warnings about incorrect comment style,\n" "> which is fixed by this patch.\n" - ">=20\n" + "> \n" "\n" "\n" "> --- a/drivers/tty/serial/8250/8250_ingenic.c\n" "> +++ b/drivers/tty/serial/8250/8250_ingenic.c\n" "> @@ -152,14 +152,18 @@ static void ingenic_uart_serial_out(struct\n" "> uart_port *p, int offset, int value)\n" - "> =C2=A0\t\tbreak;\n" - "> =C2=A0\n" - "> =C2=A0\tcase UART_IER:\n" + "> \302\240\t\tbreak;\n" + "> \302\240\n" + "> \302\240\tcase UART_IER:\n" "> -\t\t/* Enable receive timeout interrupt with the\n" - "> -\t\t=C2=A0* receive line status interrupt */\n" + "> -\t\t\302\240* receive line status interrupt */\n" "> +\t\t/*\n" - "> +\t\t=C2=A0* Enable receive timeout interrupt with the\n" - "> +\t\t=C2=A0* receive line status interrupt\n" + "> +\t\t\302\240* Enable receive timeout interrupt with the\n" + "> +\t\t\302\240* receive line status interrupt\n" "\n" "I'm pretty sure that at least one word could fit previous line.\n" "\n" "Can you re-check your patches with sane editor setting for line\n" "breaking (like 76 characters)?\n" "\n" - "> +\t\t=C2=A0*/\n" - "> =C2=A0\t\tvalue |=3D (value & 0x4) << 2;\n" - "> =C2=A0\t\tbreak;\n" - "> =C2=A0\n" - "> =C2=A0\tcase UART_MCR:\n" + "> +\t\t\302\240*/\n" + "> \302\240\t\tvalue |= (value & 0x4) << 2;\n" + "> \302\240\t\tbreak;\n" + "> \302\240\n" + "> \302\240\tcase UART_MCR:\n" "> -\t\t/* If we have enabled modem status IRQs we should\n" "> enable modem\n" - "> -\t\t=C2=A0* mode. */\n" + "> -\t\t\302\240* mode. */\n" "> +\t\t/*\n" - "> +\t\t=C2=A0* If we have enabled modem status IRQs we should\n" + "> +\t\t\302\240* If we have enabled modem status IRQs we should\n" "> enable modem\n" - "> +\t\t=C2=A0* mode.\n" + "> +\t\t\302\240* mode.\n" "\n" "To check.\n" "\n" - "> +\t\t=C2=A0*/\n" - ">=20\n" + "> +\t\t\302\240*/\n" + "> \n" "\n" "> @@ -367,8 +367,10 @@ static const struct pnp_device_id\n" - "> pnp_dev_table[] =3D {\n" - "> =C2=A0\t{\t\"PNPCXXX\",\t\tUNKNOWN_DEV\t},\n" - "> =C2=A0\t/* More unknown PnP modems */\n" - "> =C2=A0\t{\t\"PNPDXXX\",\t\tUNKNOWN_DEV\t},\n" + "> pnp_dev_table[] = {\n" + "> \302\240\t{\t\"PNPCXXX\",\t\tUNKNOWN_DEV\t},\n" + "> \302\240\t/* More unknown PnP modems */\n" + "> \302\240\t{\t\"PNPDXXX\",\t\tUNKNOWN_DEV\t},\n" "> -\t/* Winbond CIR port, should not be probed. We should keep\n" "> track\n" - "> -\t=C2=A0=C2=A0=C2=A0of it to prevent the legacy serial driver from pr=\n" - "obing it\n" + "> -\t\302\240\302\240\302\240of it to prevent the legacy serial driver from probing it\n" "> */\n" "> +\t/*\n" - "> +\t=C2=A0* Winbond CIR port, should not be probed. We should keep\n" + "> +\t\302\240* Winbond CIR port, should not be probed. We should keep\n" "> track\n" - "> +\t=C2=A0* of it to prevent the legacy serial driver from probing it\n" + "> +\t\302\240* of it to prevent the legacy serial driver from probing it\n" "\n" "I would suggest to add dot at the end of sentences. Here and in the\n" "rest of the places.\n" @@ -92,22 +91,21 @@ "> --- a/drivers/tty/serial/8250/8250_port.c\n" "> +++ b/drivers/tty/serial/8250/8250_port.c\n" "> @@ -250,9 +250,11 @@ static const struct serial8250_config\n" - "> uart_config[] =3D {\n" - "> =C2=A0\t\t.fcr\t\t=3D UART_FCR_ENABLE_FIFO |\n" + "> uart_config[] = {\n" + "> \302\240\t\t.fcr\t\t= UART_FCR_ENABLE_FIFO |\n" "> UART_FCR_R_TRIG_10,\n" - "> =C2=A0\t\t.flags\t\t=3D UART_CAP_FIFO |\n" + "> \302\240\t\t.flags\t\t= UART_CAP_FIFO |\n" "> UART_CAP_AFE,\n" - "> =C2=A0\t},\n" + "> \302\240\t},\n" "> -/* tx_loadsz is set to 63-bytes instead of 64-bytes to implement\n" - "> -workaround of errata A-008006 which states that tx_loadsz should=C2=A0=\n" - "=C2=A0be\n" + "> -workaround of errata A-008006 which states that tx_loadsz should\302\240\302\240be\n" "> -configured less than Maximum supported fifo bytes */\n" "> +\t/*\n" - "> +\t=C2=A0* tx_loadsz is set to 63-bytes instead of 64-bytes to\n" + "> +\t\302\240* tx_loadsz is set to 63-bytes instead of 64-bytes to\n" "> implement\n" - "> +\t=C2=A0* workaround of errata A-008006 which states that tx_loadsz\n" + "> +\t\302\240* workaround of errata A-008006 which states that tx_loadsz\n" "> should be\n" - "> +\t=C2=A0* configured less than Maximum supported fifo bytes\n" + "> +\t\302\240* configured less than Maximum supported fifo bytes\n" "\n" "Ditto.\n" "\n" @@ -115,52 +113,44 @@ "> +++ b/drivers/tty/serial/8250/serial_cs.c\n" "> @@ -441,16 +441,20 @@ static int simple_config(struct pcmcia_device\n" "> *link)\n" - "> =C2=A0\tstruct serial_info *info =3D link->priv;\n" - "> =C2=A0\tint i =3D -ENODEV, try;\n" - "> =C2=A0\n" + "> \302\240\tstruct serial_info *info = link->priv;\n" + "> \302\240\tint i = -ENODEV, try;\n" + "> \302\240\n" "> -\t/* First pass: look for a config entry that looks normal.\n" - "> -\t=C2=A0* Two tries: without IO aliases, then with aliases */\n" + "> -\t\302\240* Two tries: without IO aliases, then with aliases */\n" "> +\t/*\n" - "> +\t=C2=A0* First pass: look for a config entry that looks normal.\n" - "> +\t=C2=A0* Two tries: without IO aliases, then with aliases\n" + "> +\t\302\240* First pass: look for a config entry that looks normal.\n" + "> +\t\302\240* Two tries: without IO aliases, then with aliases\n" "\n" "Ditto.\n" "\n" "> @@ -480,8 +484,10 @@ static int multi_config_check(struct\n" "> pcmcia_device *p_dev, void *priv_data)\n" - "> =C2=A0\tif (p_dev->resource[1]->end)\n" - "> =C2=A0\t\treturn -EINVAL;\n" - "> =C2=A0\n" + "> \302\240\tif (p_dev->resource[1]->end)\n" + "> \302\240\t\treturn -EINVAL;\n" + "> \302\240\n" "> -\t/* The quad port cards have bad CIS's, so just look for a\n" - "> -\t=C2=A0=C2=A0=C2=A0window larger than 8 ports and assume it will be =\n" - "right */\n" + "> -\t\302\240\302\240\302\240window larger than 8 ports and assume it will be right */\n" "> +\t/*\n" - "> +\t=C2=A0* The quad port cards have bad CIS's, so just look for a\n" - "> +\t=C2=A0* window larger than 8 ports and assume it will be right\n" + "> +\t\302\240* The quad port cards have bad CIS's, so just look for a\n" + "> +\t\302\240* window larger than 8 ports and assume it will be right\n" "\n" "Ditto.\n" "\n" "> -\t/* Another check for dual-serial cards: look for either\n" "> serial or\n" - "> -\t=C2=A0=C2=A0=C2=A0multifunction cards that ask for appropriate IO p=\n" - "ort\n" + "> -\t\302\240\302\240\302\240multifunction cards that ask for appropriate IO port\n" "> ranges */\n" "> +\t/*\n" - "> +\t=C2=A0* Another check for dual-serial cards: look for either\n" + "> +\t\302\240* Another check for dual-serial cards: look for either\n" "> serial or\n" - "> +\t=C2=A0* multifunction cards that ask for appropriate IO port\n" + "> +\t\302\240* multifunction cards that ask for appropriate IO port\n" "> ranges\n" "\n" "Ditto.\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 -62ec592a38091be8cb0e281e3d523410d5c0a3c5d3ffffd91c8d51bbd9c90137 +650273f6b45667d79e92f91322b74afabc0dad6dde4321ae9a5bf8f5196abd52
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.