From: Mark Hounschell <markh@compro.net>
Date: Fri, 25 Apr 2014 18:19:42 +0000 (-0400)
Subject: staging: dgap: refactor ugly dgap_init_one function
X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~726
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a82524167abda7dc92b76a4ba85ff2ceca6f8d8;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index f597432ede8c..f2ad7ae8036e 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -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)