dgnc: move more repeating code under 'failed' label
PATCH 1/1 dgnc: move more repeating code under 'failed' label
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().
--- drivers/staging/dgnc/dgnc_driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/staging/dgnc/dgnc_driver.c +2 -10
@@ -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 ; - }
Signature · 1 line
2.3.2
Added Matteo to the CC list because he was working on this function as well and I remembered something I wanted to tell him.
Quoted 5 lines · Giedrius Statkevičius
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().
This function totally sucks.
This patch is useless because we will never use the brd->state in the cases where we fail. We shouldn't be saving inconsistent crap into dgnc_Board[] because that is barf inducing ugly even though it's not a bug given that we don't use it.
Only do:
dgnc_Board[dgnc_NumBoards] = brd;
when the brd is fully configured at the end of the dgnc_found_board() function.
regards,
dan carpenter
Quoted 56 lines
Signed-off-by Giedrius Statkevičius <[email protected]>--- drivers/staging/dgnc/dgnc_driver.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)drivers/staging/dgnc/dgnc_driver.c +2
-10@@ -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 ; - }Signature · 6 lines
2.3.2 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Quoted 19 lines · Dan Carpenter
Added Matteo to the CC list because he was working on this function as well and I remembered something I wanted to tell him.
Quoted 5 lines · Giedrius Statkevičius
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().This function totally sucks.
This patch is useless because we will never use the
brd->statein the cases where we fail. We shouldn't be saving inconsistent crap into dgnc_Board[] because that is barf inducing ugly even though it's not a bug given that we don't use it.Only do:
Quoted 7 lines
dgnc_Board[dgnc_NumBoards] = brd;when the brd is fully configured at the end of the
dgnc_found_board()function.regards,
dan carpenter
First time I've made this patch I was purely looking at this from a cosmetical point. But now that I've looked more at this I see that you have a good point. I've made a patch that tries to address this issue and posted it in another thread.
Signature · 2 lines
Thanks, Giedrius