leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: dgnc: audit goto's in dgnc_driver

Browse Source 
TODO file requests fix up of error handling.

Audit dgnc_driver.c and fix all return paths to be uniform and inline
with kernel coding style.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobin C. Harding 2017-03-07 20:57:01 +11:00 committed by Greg Kroah-Hartman
parent 82c41a994c
commit c8863b3ff7
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/dgnc/dgnc_driver.c
View File

@ -98,13 +98,11 @@ static const struct board_id dgnc_ids[] = {
static int dgnc_do_remap(struct dgnc_board *brd) static int dgnc_do_remap(struct dgnc_board *brd)
{ {
int rc = 0;
brd->re_map_membase = ioremap(brd->membase, 0x1000); brd->re_map_membase = ioremap(brd->membase, 0x1000);
if (!brd->re_map_membase) if (!brd->re_map_membase)
rc = -ENOMEM; return -ENOMEM;
return rc; return 0;
} }
/* /*
@ -198,7 +196,6 @@ static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id)
brd->bd_dividend = 921600; brd->bd_dividend = 921600;
rc = dgnc_do_remap(brd); rc = dgnc_do_remap(brd);
if (rc < 0) if (rc < 0)
goto failed; goto failed;
@ -283,27 +280,23 @@ static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id)
failed: failed:
kfree(brd); kfree(brd);
return ERR_PTR(rc); return ERR_PTR(rc);
} }
static int dgnc_request_irq(struct dgnc_board *brd) static int dgnc_request_irq(struct dgnc_board *brd)
{ {
int rc = 0;
if (brd->irq) { if (brd->irq) {
rc = request_irq(brd->irq, brd->bd_ops->intr, int rc = request_irq(brd->irq, brd->bd_ops->intr,
IRQF_SHARED, "DGNC", brd); IRQF_SHARED, "DGNC", brd);
if (rc) { if (rc) {
dev_err(&brd->pdev->dev, dev_err(&brd->pdev->dev,
"Failed to hook IRQ %d\n", brd->irq); "Failed to hook IRQ %d\n", brd->irq);
brd->state = BOARD_FAILED; brd->state = BOARD_FAILED;
brd->dpastatus = BD_NOFEP; brd->dpastatus = BD_NOFEP;
rc = -ENODEV; return -ENODEV;
} }
} }
return rc; return 0;
} }
static void dgnc_free_irq(struct dgnc_board *brd) static void dgnc_free_irq(struct dgnc_board *brd)
@ -387,7 +380,6 @@ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
/* wake up and enable device */ /* wake up and enable device */
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) if (rc)
return -EIO; return -EIO;
@ -419,17 +411,14 @@ static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
brd->dpastatus = BD_RUNNING; brd->dpastatus = BD_RUNNING;
dgnc_board[dgnc_num_boards++] = brd; dgnc_board[dgnc_num_boards++] = brd;
return 0; return 0;
free_irq: free_irq:
dgnc_free_irq(brd); dgnc_free_irq(brd);
unregister_tty: unregister_tty:
dgnc_tty_unregister(brd); dgnc_tty_unregister(brd);
failed: failed:
kfree(brd); kfree(brd);
return rc; return rc;
} }
@ -488,7 +477,6 @@ static int dgnc_start(void)
spin_unlock_irqrestore(&dgnc_poll_lock, flags); spin_unlock_irqrestore(&dgnc_poll_lock, flags);
add_timer(&dgnc_poll_timer); add_timer(&dgnc_poll_timer);
return 0; return 0;
failed_device: failed_device:
@ -597,7 +585,6 @@ static int __init dgnc_init_module(void)
/* Initialize global stuff */ /* Initialize global stuff */
rc = dgnc_start(); rc = dgnc_start();
if (rc < 0) if (rc < 0)
return rc; return rc;