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, 22 insertions, 17 deletions

diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index e76db9e4d504..d33632917696 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -186,29 +186,34 @@ void gsc_asic_assign_irq(struct gsc_asic *asic, int local_irq, int *irqp)
         *irqp = irq;
 }
 
-static struct device *next_device(struct klist_iter *i)
+struct gsc_fixup_struct {
+        void (*choose_irq)(struct parisc_device *, void *);
+        void *ctrl;
+};
+
+static int gsc_fixup_irqs_callback(struct device *dev, void *data)
 {
-        struct klist_node * n = klist_next(i);
-        return n ? container_of(n, struct device, knode_parent) : NULL;
+        struct parisc_device *padev = to_parisc_device(dev);
+        struct gsc_fixup_struct *gf = data;
+
+        /* work-around for 715/64 and others which have parent
+           at path [5] and children at path [5/0/x] */
+        if (padev->id.hw_type == HPHW_FAULTY)
+                gsc_fixup_irqs(padev, gf->ctrl, gf->choose_irq);
+        gf->choose_irq(padev, gf->ctrl);
+
+        return 0;
 }
 
 void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl,
                         void (*choose_irq)(struct parisc_device *, void *))
 {
-        struct device *dev;
-        struct klist_iter i;
-
-        klist_iter_init(&parent->dev.klist_children, &i);
-        while ((dev = next_device(&i))) {
-                struct parisc_device *padev = to_parisc_device(dev);
-
-                /* work-around for 715/64 and others which have parent 
-                   at path [5] and children at path [5/0/x] */
-                if (padev->id.hw_type == HPHW_FAULTY)
-                        return gsc_fixup_irqs(padev, ctrl, choose_irq);
-                choose_irq(padev, ctrl);
-        }
-        klist_iter_exit(&i);
+        struct gsc_fixup_struct data = {
+                .choose_irq     = choose_irq,
+                .ctrl           = ctrl,
+        };
+
+        device_for_each_child(&parent->dev, &data, gsc_fixup_irqs_callback);
 }
 
 int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic)