From: Anton Wuerfel <anton.wuerfel@fau.de>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.com>,
"James E.J. Bottomley" <jejb@parisc-linux.org>,
Helge Deller <deller@gmx.de>,
Joachim Eastwood <manabian@gmail.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Peter Hurley <peter@hurleysoftware.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Phillip Raffeck <phillip.raffeck@fau.de>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Peter Hung <hpeter@gmail.com>,
linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-parisc@vger.kernel.org, linux-kernel@i4.cs.fau.de,
Anton Wuerfel <anton.wuerfel@fau.de>
Subject: [PATCH v6 05/15] tty: serial: 8250: Remove else after return
Date: Wed, 13 Jan 2016 22:29:11 +0100 [thread overview]
Message-ID: <1452720561-28443-6-git-send-email-anton.wuerfel@fau.de> (raw)
In-Reply-To: <1452720561-28443-1-git-send-email-anton.wuerfel@fau.de>
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>
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
next prev parent reply other threads:[~2016-01-13 21:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 21:29 [PATCH v6 00/15] tty: serial: 8250: Fix checkpatch warnings Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 01/15] tty: serial: 8250: Fix whitespace errors Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 02/15] tty: serial: 8250: Replace spaces with tabs Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 03/15] tty: serial: 8250: Fix braces after struct Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 04/15] tty: serial: 8250: Fix multiline comment style Anton Wuerfel
2016-01-13 21:29 ` Anton Wuerfel [this message]
2016-01-13 21:29 ` [PATCH v6 06/15] tty: serial: 8250: Move EXPORT_SYMBOL to function Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 07/15] tty: serial: 8250: Fix line continuation warning Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 08/15] tty: serial: 8250: Add parentheses to macro Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 09/15] tty: serial: 8250: Fix multi-line strings Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 10/15] tty: serial: 8250: Suitably replace printk Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 11/15] tty: serial: 8250: Remove SERIAL_DEBUG_PNP macro Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 12/15] tty: serial: 8250: Correct conversion specifiers Anton Wuerfel
2016-01-14 9:31 ` Andy Shevchenko
2016-01-13 21:29 ` [PATCH v6 13/15] tty: serial: 8250: Merge duplicate conditions Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 14/15] tty: serial: 8250: Fix indentation warnings Anton Wuerfel
2016-01-13 21:29 ` [PATCH v6 15/15] tty: serial: 8250: Add generic port init macro Anton Wuerfel
2016-01-14 9:13 ` [PATCH v6 00/15] tty: serial: 8250: Fix checkpatch warnings Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452720561-28443-6-git-send-email-anton.wuerfel@fau.de \
--to=anton.wuerfel@fau.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bigeasy@linutronix.de \
--cc=deller@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=hpeter@gmail.com \
--cc=jejb@parisc-linux.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=peter@hurleysoftware.com \
--cc=phillip.raffeck@fau.de \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®