Commit 6a825241 authored by Mark Hounschell's avatar Mark Hounschell Committed by Greg Kroah-Hartman
Browse files

staging: dgap: refactor ugly dgap_init_one function



This patch just cleans up the ugly dgap_init_one function

Signed-off-by: default avatarMark Hounschell <markh@compro.net>
Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Tested-by: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f34475f5
Loading
Loading
Loading
Loading
+8 −11
Original line number Diff line number Diff line
@@ -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);
		}
	}
	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)