From patchwork Thu Jan 14 15:08:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anton Wuerfel X-Patchwork-Id: 8032651 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 325AABEEE5 for ; Thu, 14 Jan 2016 15:10:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1567B20394 for ; Thu, 14 Jan 2016 15:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 266292037E for ; Thu, 14 Jan 2016 15:10:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755381AbcANPKF (ORCPT ); Thu, 14 Jan 2016 10:10:05 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:57764 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755232AbcANPIz (ORCPT ); Thu, 14 Jan 2016 10:08:55 -0500 Received: from faui49man2 (faui49man2.informatik.uni-erlangen.de [131.188.42.190]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id D70ED58C4E7; Thu, 14 Jan 2016 16:08:52 +0100 (CET) Received: by faui49man2 (sSMTP sendmail emulation); Thu, 14 Jan 2016 16:08:52 +0100 From: Anton Wuerfel To: Greg Kroah-Hartman Cc: Jiri Slaby , "James E.J. Bottomley" , Helge Deller , Joachim Eastwood , Matthias Brugger , Masahiro Yamada , Peter Hurley , Sebastian Andrzej Siewior , Andy Shevchenko , Phillip Raffeck , Heikki Krogerus , Peter Hung , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@i4.cs.fau.de, Anton Wuerfel Subject: [PATCH v7 13/15] tty: serial: 8250: Merge duplicate conditions Date: Thu, 14 Jan 2016 16:08:22 +0100 Message-Id: <1452784104-30840-14-git-send-email-anton.wuerfel@fau.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1452784104-30840-1-git-send-email-anton.wuerfel@fau.de> References: <1452784104-30840-1-git-send-email-anton.wuerfel@fau.de> MIME-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Phillip Raffeck Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Cc: linux-kernel@i4.cs.fau.de --- drivers/tty/serial/8250/8250_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index fbd4222..b22e5a5 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; }