Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1309382
| From | Anton Wuerfel <anton.wuerfel@fau.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v7 05/15] tty: serial: 8250: Remove else after return |
| Date | 2016-01-14 16:20 +0100 |
| Message-ID | <qQRQT-rb-31@gated-at.bofh.it> (permalink) |
| References | <qQRHc-nE-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
This patch fixes checkpatch warnings about unnecessary else blocks after
return statements.
Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-kernel@i4.cs.fau.de
---
drivers/tty/serial/8250/8250_pci.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 534ca18..8543719 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)
pi = (c & 0xff);
- if (pi == 2) {
+ if (pi == 2)
return 1;
- } else if ((pi == 0) &&
- (dev->device == 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
@@ -816,12 +816,12 @@ static int pci_netmos_9900_numports(struct pci_dev *dev)
* advertising the same function 3 as the 4s+2s1p config.
*/
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");
- return 0;
- }
+
+ dev_err(&dev->dev,
+ "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
+ return 0;
}
moan_device("unknown NetMos/Mostech program interface", dev);
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v7 00/15] tty: serial: 8250: Fix checkpatch warnings Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:10 +0100 [PATCH v7 15/15] tty: serial: 8250: Add generic port init macro Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:10 +0100 [PATCH v7 07/15] tty: serial: 8250: Fix line continuation warning Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:10 +0100 [PATCH v7 09/15] tty: serial: 8250: Fix multi-line strings Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 11/15] tty: serial: 8250: Remove SERIAL_DEBUG_PNP macro Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 12/15] tty: serial: 8250: Correct conversion specifiers Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 13/15] tty: serial: 8250: Merge duplicate conditions Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 03/15] tty: serial: 8250: Fix braces after struct Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 02/15] tty: serial: 8250: Replace spaces with tabs Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 08/15] tty: serial: 8250: Add parentheses to macro Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 01/15] tty: serial: 8250: Fix whitespace errors Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 10/15] tty: serial: 8250: Suitably replace printk Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 05/15] tty: serial: 8250: Remove else after return Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100 [PATCH v7 06/15] tty: serial: 8250: Move EXPORT_SYMBOL to function Anton Wuerfel <anton.wuerfel@fau.de> - 2016-01-14 16:20 +0100
csiph-web