[PATCH] md/bitmap: fix online removal of file-backed bitmaps

[safe/jmp/linux-2.6] / drivers / net / sunhme.c

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index ec51f39..c33ead3 100644 (file)
--- 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;