From: David S. Miller <davem@sunset.davemloft.net>
Date: Sat, 24 Jun 2006 04:36:46 +0000 (-0700)
Subject: [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().
X-Git-Tag: v2.6.18-rc1~1075^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96399487ad84b0d935923fe3652943159f36fb64;p=linux-2.6

[NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index ec51f397e1..c33ead3470 100644
--- a/drivers/net/sunhme.c
+++ b/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;