---

yaml --- r: 348733 b: refs/heads/master c: 9349f8a h: refs/heads/master i: 348731: 60f6eaf v: v3
git-mirror · Jan 7, 2013 · 4d2a3a2 · 4d2a3a2
1 parent 8980156
commit 4d2a3a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6102c48bd421074a33e102f2ebda3724e8d275f9
+refs/heads/master: 9349f8af28ea89639b3c97da583d60631ed10398
diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_core.c b/trunk/drivers/staging/vme/devices/vme_pio2_core.c
@@ -162,11 +162,9 @@ static struct vme_driver pio2_driver = {
 
 static int __init pio2_init(void)
 {
-	int retval = 0;
-
 	if (bus_num == 0) {
 		pr_err("No cards, skipping registration\n");
-		goto err_nocard;
+		return -ENODEV;
 	}
 
 	if (bus_num > PIO2_CARDS_MAX) {
@@ -176,15 +174,7 @@ static int __init pio2_init(void)
 	}
 
 	/* Register the PIO2 driver */
-	retval = vme_register_driver(&pio2_driver, bus_num);
-	if (retval != 0)
-		goto err_reg;
-
-	return retval;
-
-err_reg:
-err_nocard:
-	return retval;
+	return  vme_register_driver(&pio2_driver, bus_num);
 }
 
 static int pio2_match(struct vme_dev *vdev)