From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932109AbbCHRrB (ORCPT ); Sun, 8 Mar 2015 13:47:01 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:37701 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753026AbbCHRq4 (ORCPT ); Sun, 8 Mar 2015 13:46:56 -0400 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= To: lidza.louina@gmail.com, markh@compro.net Cc: gregkh@linuxfoundation.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Subject: [PATCH] dgnc: move more repeating code under 'failed' label Date: Sun, 8 Mar 2015 19:46:37 +0200 Message-Id: <1425836797-3632-1-git-send-email-giedrius.statkevicius@gmail.com> X-Mailer: git-send-email 2.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently the label is only used to return a error code to the caller but more repeating code is before each "goto failed;" thus we can move that code to the label. Also, remove some empty unneeded lines together with this patch in those if's and at the end of dgnc_found_board(). Signed-off-by: Giedrius Statkevičius --- drivers/staging/dgnc/dgnc_driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index fa1ee79..73ee667 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -574,17 +574,12 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) if (rc < 0) { dgnc_tty_uninit(brd); pr_err(DRVSTR ": Can't register tty devices (%d)\n", rc); - brd->state = BOARD_FAILED; - brd->dpastatus = BD_NOFEP; goto failed; } rc = dgnc_finalize_board_init(brd); if (rc < 0) { pr_err(DRVSTR ": Can't finalize board init (%d)\n", rc); - brd->state = BOARD_FAILED; - brd->dpastatus = BD_NOFEP; - goto failed; } @@ -592,9 +587,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) if (rc < 0) { dgnc_tty_uninit(brd); pr_err(DRVSTR ": Can't init tty devices (%d)\n", rc); - brd->state = BOARD_FAILED; - brd->dpastatus = BD_NOFEP; - goto failed; } @@ -628,9 +620,9 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) return 0; failed: - + brd->state = BOARD_FAILED; + brd->dpastatus = BD_NOFEP; return -ENXIO; - } -- 2.3.2