Commit 829b0000 authored Jan 14, 2016 by Anton Wuerfel Committed by Greg Kroah-Hartman Feb 06, 2016

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>

parent 9faef1cb

drivers/tty/serial/8250/8250_pci.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}