diff for duplicates of <56742836.2050004@hurleysoftware.com> diff --git a/a/1.txt b/N1/1.txt index 1231584..3b8560f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,37 +1,33 @@ On 12/18/2015 03:21 AM, Anton Wuerfel wrote: -> This patch fixes checkpatch warnings about unnecessary else blocks af= -ter +> This patch fixes checkpatch warnings about unnecessary else blocks after > return statements. Reviewed-by: Peter Hurley <peter@hurleysoftware.com> See note 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 > --- > drivers/tty/serial/8250/8250_pci.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/= -8250/8250_pci.c +> +> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c > index 7f9f245..09157fa 100644 > --- a/drivers/tty/serial/8250/8250_pci.c > +++ b/drivers/tty/serial/8250/8250_pci.c -> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_= -dev *dev) -> =20 -> pi =3D (c & 0xff); -> =20 -> - if (pi =3D=3D 2) { -> + if (pi =3D=3D 2) +> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_dev *dev) +> +> pi = (c & 0xff); +> +> - if (pi == 2) { +> + if (pi == 2) > return 1; -> - } else if ((pi =3D=3D 0) && -> - (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)) { +> - } else if ((pi == 0) && +> - (dev->device == PCI_DEVICE_ID_NETMOS_9900)) { > + -> + if ((pi =3D=3D 0) && (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)= -) { +> + if ((pi == 0) && (dev->device == PCI_DEVICE_ID_NETMOS_9900)) { > /* two possibilities: 0x30ps encodes number of parallel and > * serial ports, or 0x1000 indicates *something*. This is not > * immediately obvious, since the 2s1p+4s configuration seems @@ -39,24 +35,21 @@ dev *dev) checkpatch missed this comment style because it's what netdev uses. Not a problem, though. We're not quite so formal here. -> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_= -dev *dev) +> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_dev *dev) > * advertising the same function 3 as the 4s+2s1p config. > */ -> sub_serports =3D dev->subsystem_device & 0xf; +> sub_serports = dev->subsystem_device & 0xf; > - if (sub_serports > 0) { > + if (sub_serports > 0) > return sub_serports; > - } else { -> - dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on= - ambiguous config.\n"); +> - dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n"); > - return 0; > - } > + -> + dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on = -ambiguous config.\n"); +> + dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n"); > + return 0; > } -> =20 +> > moan_device("unknown NetMos/Mostech program interface", dev); ->=20 +> diff --git a/a/content_digest b/N1/content_digest index 860baf4..c1863a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -26,43 +26,39 @@ 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" "On 12/18/2015 03:21 AM, Anton Wuerfel wrote:\n" - "> This patch fixes checkpatch warnings about unnecessary else blocks af=\n" - "ter\n" + "> This patch fixes checkpatch warnings about unnecessary else blocks after\n" "> return statements.\n" "\n" "Reviewed-by: Peter Hurley <peter@hurleysoftware.com>\n" "\n" "See note 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" "> drivers/tty/serial/8250/8250_pci.c | 15 +++++++--------\n" "> 1 file changed, 7 insertions(+), 8 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n" - "8250/8250_pci.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n" "> index 7f9f245..09157fa 100644\n" "> --- a/drivers/tty/serial/8250/8250_pci.c\n" "> +++ b/drivers/tty/serial/8250/8250_pci.c\n" - "> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_=\n" - "dev *dev)\n" - "> =20\n" - "> \tpi =3D (c & 0xff);\n" - "> =20\n" - "> -\tif (pi =3D=3D 2) {\n" - "> +\tif (pi =3D=3D 2)\n" + "> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)\n" + "> \n" + "> \tpi = (c & 0xff);\n" + "> \n" + "> -\tif (pi == 2) {\n" + "> +\tif (pi == 2)\n" "> \t\treturn 1;\n" - "> -\t} else if ((pi =3D=3D 0) &&\n" - "> -\t\t\t (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)) {\n" + "> -\t} else if ((pi == 0) &&\n" + "> -\t\t\t (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {\n" "> +\n" - "> +\tif ((pi =3D=3D 0) && (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)=\n" - ") {\n" + "> +\tif ((pi == 0) && (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {\n" "> \t\t/* two possibilities: 0x30ps encodes number of parallel and\n" "> \t\t * serial ports, or 0x1000 indicates *something*. This is not\n" "> \t\t * immediately obvious, since the 2s1p+4s configuration seems\n" @@ -70,26 +66,23 @@ "checkpatch missed this comment style because it's what netdev uses.\n" "Not a problem, though. We're not quite so formal here.\n" "\n" - "> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_=\n" - "dev *dev)\n" + "> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)\n" "> \t\t * advertising the same function 3 as the 4s+2s1p config.\n" "> \t\t */\n" - "> \t\tsub_serports =3D dev->subsystem_device & 0xf;\n" + "> \t\tsub_serports = dev->subsystem_device & 0xf;\n" "> -\t\tif (sub_serports > 0) {\n" "> +\t\tif (sub_serports > 0)\n" "> \t\t\treturn sub_serports;\n" "> -\t\t} else {\n" - "> -\t\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on=\n" - " ambiguous config.\\n\");\n" + "> -\t\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on ambiguous config.\\n\");\n" "> -\t\t\treturn 0;\n" "> -\t\t}\n" "> +\n" - "> +\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on =\n" - "ambiguous config.\\n\");\n" + "> +\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on ambiguous config.\\n\");\n" "> +\t\treturn 0;\n" "> \t}\n" - "> =20\n" + "> \n" "> \tmoan_device(\"unknown NetMos/Mostech program interface\", dev);\n" - >=20 + > -ee0400d0f1b429586b171dcc4bfa5b754edd9b87bf9742393abec8d711b4a909 +8d94edf945d89aea021ee8772573e47529530ba1b9df504ba1c12eaaa084b74e
diff --git a/a/1.txt b/N2/1.txt index 1231584..3b8560f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,37 +1,33 @@ On 12/18/2015 03:21 AM, Anton Wuerfel wrote: -> This patch fixes checkpatch warnings about unnecessary else blocks af= -ter +> This patch fixes checkpatch warnings about unnecessary else blocks after > return statements. Reviewed-by: Peter Hurley <peter@hurleysoftware.com> See note 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 > --- > drivers/tty/serial/8250/8250_pci.c | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) ->=20 -> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/= -8250/8250_pci.c +> +> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c > index 7f9f245..09157fa 100644 > --- a/drivers/tty/serial/8250/8250_pci.c > +++ b/drivers/tty/serial/8250/8250_pci.c -> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_= -dev *dev) -> =20 -> pi =3D (c & 0xff); -> =20 -> - if (pi =3D=3D 2) { -> + if (pi =3D=3D 2) +> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_dev *dev) +> +> pi = (c & 0xff); +> +> - if (pi == 2) { +> + if (pi == 2) > return 1; -> - } else if ((pi =3D=3D 0) && -> - (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)) { +> - } else if ((pi == 0) && +> - (dev->device == PCI_DEVICE_ID_NETMOS_9900)) { > + -> + if ((pi =3D=3D 0) && (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)= -) { +> + if ((pi == 0) && (dev->device == PCI_DEVICE_ID_NETMOS_9900)) { > /* two possibilities: 0x30ps encodes number of parallel and > * serial ports, or 0x1000 indicates *something*. This is not > * immediately obvious, since the 2s1p+4s configuration seems @@ -39,24 +35,21 @@ dev *dev) checkpatch missed this comment style because it's what netdev uses. Not a problem, though. We're not quite so formal here. -> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_= -dev *dev) +> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_dev *dev) > * advertising the same function 3 as the 4s+2s1p config. > */ -> sub_serports =3D dev->subsystem_device & 0xf; +> sub_serports = dev->subsystem_device & 0xf; > - if (sub_serports > 0) { > + if (sub_serports > 0) > return sub_serports; > - } else { -> - dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on= - ambiguous config.\n"); +> - dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n"); > - return 0; > - } > + -> + dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on = -ambiguous config.\n"); +> + dev_err(&dev->dev, "NetMos/Mostech serial driver ignoring port on ambiguous config.\n"); > + return 0; > } -> =20 +> > moan_device("unknown NetMos/Mostech program interface", dev); ->=20 +> diff --git a/a/content_digest b/N2/content_digest index 860baf4..0754b7f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -26,43 +26,39 @@ 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" "On 12/18/2015 03:21 AM, Anton Wuerfel wrote:\n" - "> This patch fixes checkpatch warnings about unnecessary else blocks af=\n" - "ter\n" + "> This patch fixes checkpatch warnings about unnecessary else blocks after\n" "> return statements.\n" "\n" "Reviewed-by: Peter Hurley <peter@hurleysoftware.com>\n" "\n" "See note 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" "> drivers/tty/serial/8250/8250_pci.c | 15 +++++++--------\n" "> 1 file changed, 7 insertions(+), 8 deletions(-)\n" - ">=20\n" - "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/=\n" - "8250/8250_pci.c\n" + "> \n" + "> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c\n" "> index 7f9f245..09157fa 100644\n" "> --- a/drivers/tty/serial/8250/8250_pci.c\n" "> +++ b/drivers/tty/serial/8250/8250_pci.c\n" - "> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_=\n" - "dev *dev)\n" - "> =20\n" - "> \tpi =3D (c & 0xff);\n" - "> =20\n" - "> -\tif (pi =3D=3D 2) {\n" - "> +\tif (pi =3D=3D 2)\n" + "> @@ -805,10 +805,10 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)\n" + "> \n" + "> \tpi = (c & 0xff);\n" + "> \n" + "> -\tif (pi == 2) {\n" + "> +\tif (pi == 2)\n" "> \t\treturn 1;\n" - "> -\t} else if ((pi =3D=3D 0) &&\n" - "> -\t\t\t (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)) {\n" + "> -\t} else if ((pi == 0) &&\n" + "> -\t\t\t (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {\n" "> +\n" - "> +\tif ((pi =3D=3D 0) && (dev->device =3D=3D PCI_DEVICE_ID_NETMOS_9900)=\n" - ") {\n" + "> +\tif ((pi == 0) && (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {\n" "> \t\t/* two possibilities: 0x30ps encodes number of parallel and\n" "> \t\t * serial ports, or 0x1000 indicates *something*. This is not\n" "> \t\t * immediately obvious, since the 2s1p+4s configuration seems\n" @@ -70,26 +66,23 @@ "checkpatch missed this comment style because it's what netdev uses.\n" "Not a problem, though. We're not quite so formal here.\n" "\n" - "> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_=\n" - "dev *dev)\n" + "> @@ -816,12 +816,11 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)\n" "> \t\t * advertising the same function 3 as the 4s+2s1p config.\n" "> \t\t */\n" - "> \t\tsub_serports =3D dev->subsystem_device & 0xf;\n" + "> \t\tsub_serports = dev->subsystem_device & 0xf;\n" "> -\t\tif (sub_serports > 0) {\n" "> +\t\tif (sub_serports > 0)\n" "> \t\t\treturn sub_serports;\n" "> -\t\t} else {\n" - "> -\t\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on=\n" - " ambiguous config.\\n\");\n" + "> -\t\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on ambiguous config.\\n\");\n" "> -\t\t\treturn 0;\n" "> -\t\t}\n" "> +\n" - "> +\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on =\n" - "ambiguous config.\\n\");\n" + "> +\t\tdev_err(&dev->dev, \"NetMos/Mostech serial driver ignoring port on ambiguous config.\\n\");\n" "> +\t\treturn 0;\n" "> \t}\n" - "> =20\n" + "> \n" "> \tmoan_device(\"unknown NetMos/Mostech program interface\", dev);\n" - >=20 + > -ee0400d0f1b429586b171dcc4bfa5b754edd9b87bf9742393abec8d711b4a909 +220677cb7eff68e1ca7b70eb9ce5b47629d1f891b5b94621f18e2035839ec74c
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.