---

yaml --- r: 29581 b: refs/heads/master c: 9639948 h: refs/heads/master i: 29579: ee82632 v: v3
git-mirror · Jun 24, 2006 · cf8ce31 · cf8ce31
1 parent fb16fca
commit cf8ce31
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0442209e41b3453736ef974ee709a6ae15d99fb
+refs/heads/master: 96399487ad84b0d935923fe3652943159f36fb64
diff --git a/trunk/drivers/net/sunhme.c b/trunk/drivers/net/sunhme.c
@@ -2568,14 +2568,10 @@ static void __init quattro_apply_ranges(struct quattro *qp, struct happy_meal *h
  */
 static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)
 {
-	struct sbus_bus *sbus;
 	struct sbus_dev *sdev;
 	struct quattro *qp;
 	int i;
 
-	if (qfe_sbus_list == NULL)
-		goto found;
-
 	for (qp = qfe_sbus_list; qp != NULL; qp = qp->next) {
 		for (i = 0, sdev = qp->quattro_dev;
 		     (sdev != NULL) && (i < 4);
@@ -2584,17 +2580,7 @@ static struct quattro * __init quattro_sbus_find(struct sbus_dev *goal_sdev)
 				return qp;
 		}
 	}
-	for_each_sbus(sbus) {
-		for_each_sbusdev(sdev, sbus) {
-			if (sdev == goal_sdev)
-				goto found;
-		}
-	}
-
-	/* Cannot find quattro parent, fail. */
-	return NULL;
 
-found:
 	qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);
 	if (qp != NULL) {
 		int i;