summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/8250
diff options
context:
space:
mode:
authorAnton Wuerfel <anton.wuerfel@fau.de>2016-01-14 16:08:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-06 23:15:53 -0800
commit829b0000242e3d2729972a034209afdd2b004456 (patch)
treebc689b64c2f437e965c057084efdb7b202b69538 /drivers/tty/serial/8250
parent9faef1cb33d4cc17ae4e85de67aa242eebb64102 (diff)
downloadblackbird-op-linux-829b0000242e3d2729972a034209afdd2b004456.tar.gz
blackbird-op-linux-829b0000242e3d2729972a034209afdd2b004456.zip
tty: serial: 8250: Merge duplicate conditions
This patch refactors a switch case statement by merging an if condition in the default case into an identical condition right after the switch statement. This comes with a slight change in behaviour: If pci_netmos_9900_numports returns 0, an additional warning is printed. Signed-off-by: Anton Würfel <anton.wuerfel@fau.de> Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-kernel@i4.cs.fau.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/8250')
-rw-r--r--drivers/tty/serial/8250/8250_pci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index ec8a63573fd2..4b1c241e6f75 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -850,13 +850,13 @@ static int pci_netmos_init(struct pci_dev *dev)
break;
default:
- if (num_serial == 0 ) {
- moan_device("unknown NetMos/Mostech device", dev);
- }
+ break;
}
- if (num_serial == 0)
+ if (num_serial == 0) {
+ moan_device("unknown NetMos/Mostech device", dev);
return -ENODEV;
+ }
return num_serial;
}
OpenPOWER on IntegriCloud