UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: dgap: refactor ugly dgap_init_one function 

This patch just cleans up the ugly dgap_init_one function

Signed-off-by: Mark Hounschell <markh@compro.net>
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Hounschell 2014-04-25 14:19:42 -04:00 committed by Greg Kroah-Hartman
parent f34475f5ba
commit 6a82524167
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/dgap/dgap.c
View File

@ -575,19 +575,16 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (dgap_NumBoards >= MAXBOARDS)
return -EPERM;
/* wake up and enable device */
rc = pci_enable_device(pdev);
if (rc)
return -EIO;
if (rc < 0) {
rc = -EIO;
} else {
rc = dgap_probe1(pdev, ent->driver_data);
if (rc == 0) {
dgap_NumBoards++;
rc = dgap_firmware_load(pdev, ent->driver_data);
}
}
return rc;
rc = dgap_probe1(pdev, ent->driver_data);
if (rc)
return rc;
dgap_NumBoards++;
return dgap_firmware_load(pdev, ent->driver_data);
}
static int dgap_probe1(struct pci_dev *pdev, int card_type)