lkml.org 
[lkml]   [2015]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] dgnc: move more repeating code under 'failed' label
Date
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 <giedrius.statkevicius@gmail.com>
---
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


\
 
 \ /
  Last update: 2015-03-08 19:01    [W:0.039 / U:2.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site