[PATCH v5 15/15] tty: serial: 8250: Merge duplicate conditions

From: Anton Wuerfel
Date: Wed Jan 13 2016 - 11:40:17 EST


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@xxxxxx>
Signed-off-by: Phillip Raffeck <phillip.raffeck@xxxxxx>
Cc: linux-kernel@xxxxxxxxxxxx
---
drivers/tty/serial/8250/8250_pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 1dd607f..50ab301 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -854,8 +854,10 @@ static int pci_netmos_init(struct pci_dev *dev)
}
}

- if (num_serial == 0)
+ if (num_serial == 0) {
+ moan_device("unknown NetMos/Mostech device", dev);
return -ENODEV;
+ }

return num_serial;
}
--
1.9.1