parisc: remove klist iterators

commit 11c3b5c3e08f4d855cbef52883c266b9ab9df879
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Tue Dec 16 12:24:56 2008 -0800

    driver core: move klist_children into private structure

Broke our parisc build pretty badly because we touch the klists directly
in three cases (AGP, SBA and GSC).  Although GregKH will revert this
patch, there's no reason we should be using the iterators directly, we
can just move to the standard device_for_each_child() API.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index db60539bf67a..699e3422ad93 100644
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -359,9 +359,16 @@ fail:
         return error;
 }
 
-static struct device *next_device(struct klist_iter *i) {
-        struct klist_node * n = klist_next(i);
-        return n ? container_of(n, struct device, knode_parent) : NULL;
+static int
+find_quicksilver(struct device *dev, void *data)
+{
+        struct parisc_device **lba = data;
+        struct parisc_device *padev = to_parisc_device(dev);
+
+        if (IS_QUICKSILVER(padev))
+                *lba = padev;
+
+        return 0;
 }
 
 static int
@@ -372,8 +379,6 @@ parisc_agp_init(void)
         int err = -1;
         struct parisc_device *sba = NULL, *lba = NULL;
         struct lba_device *lbadev = NULL;
-        struct device *dev = NULL;
-        struct klist_iter i;
 
         if (!sba_list)
                 goto out;
@@ -386,13 +391,7 @@ parisc_agp_init(void)
         }
 
         /* Now search our Pluto for our precious AGP device... */
-        klist_iter_init(&sba->dev.klist_children, &i);
-        while ((dev = next_device(&i))) {
-                struct parisc_device *padev = to_parisc_device(dev);
-                if (IS_QUICKSILVER(padev))
-                        lba = padev;
-        }
-        klist_iter_exit(&i);
+        device_for_each_child(&sba->dev, &lba, find_quicksilver);
 
         if (!lba) {
                 printk(KERN_INFO DRVPFX "No AGP devices found.\n");