Merge ../linux-2.6

1 files changed, 69 insertions, 57 deletions

diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c
index 04719196fd20..f2ccfea8fdb8 100644
--- a/drivers/s390/net/qeth_proc.c
+++ b/drivers/s390/net/qeth_proc.c
@@ -27,23 +27,33 @@ const char *VERSION_QETH_PROC_C = "$Revision: 1.13 $";
 #define QETH_PROCFILE_NAME "qeth"
 static struct proc_dir_entry *qeth_procfile;
 
+static int
+qeth_procfile_seq_match(struct device *dev, void *data)
+{
+        return 1;
+}
+
 static void *
 qeth_procfile_seq_start(struct seq_file *s, loff_t *offset)
 {
-        struct list_head *next_card = NULL;
-        int i = 0;
+        struct device *dev;
+        loff_t nr;
 
         down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
 
-        if (*offset == 0)
+        nr = *offset;
+        if (nr == 0)
                 return SEQ_START_TOKEN;
 
-        /* get card at pos *offset */
-        list_for_each(next_card, &qeth_ccwgroup_driver.driver.devices)
-                if (++i == *offset)
-                        return next_card;
+        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL,
+                                 NULL, qeth_procfile_seq_match);
 
-        return NULL;
+        /* get card at pos *offset */
+        nr = *offset;
+        while (nr-- > 1 && dev)
+                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
+                                         NULL, qeth_procfile_seq_match);
+        return (void *) dev;
 }
 
 static void
@@ -55,23 +65,21 @@ qeth_procfile_seq_stop(struct seq_file *s, void* it)
 static void *
 qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
 {
-        struct list_head *next_card = NULL;
-        struct list_head *current_card;
+        struct device *prev, *next;
 
         if (it == SEQ_START_TOKEN) {
-                next_card = qeth_ccwgroup_driver.driver.devices.next;
-                if (next_card->next == next_card) /* list empty */
-                        return NULL;
-                (*offset)++;
-        } else {
-                current_card = (struct list_head *)it;
-                if (current_card->next == &qeth_ccwgroup_driver.driver.devices)
-                        return NULL; /* end of list reached */
-                next_card = current_card->next;
-                (*offset)++;
+                next = driver_find_device(&qeth_ccwgroup_driver.driver,
+                                          NULL, NULL, qeth_procfile_seq_match);
+                if (next)
+                        (*offset)++;
+                return (void *) next;
         }
-
-        return next_card;
+        prev = (struct device *) it;
+        next = driver_find_device(&qeth_ccwgroup_driver.driver,
+                                  prev, NULL, qeth_procfile_seq_match);
+        if (next)
+                (*offset)++;
+        return (void *) next;
 }
 
 static inline const char *
@@ -126,7 +134,7 @@ qeth_procfile_seq_show(struct seq_file *s, void *it)
                               "-------------- ---- ------ ---------- ---- "
                               "---- ----- -----\n");
         } else {
-                device = list_entry(it, struct device, driver_list);
+                device = (struct device *) it;
                 card = device->driver_data;
                 seq_printf(s, "%s/%s/%s x%02X   %-10s %-14s %-4i ",
                                 CARD_RDEV_ID(card),
@@ -180,17 +188,20 @@ static struct proc_dir_entry *qeth_perf_procfile;
 static void *
 qeth_perf_procfile_seq_start(struct seq_file *s, loff_t *offset)
 {
-        struct list_head *next_card = NULL;
-        int i = 0;
+        struct device *dev = NULL;
+        int nr;
 
         down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
         /* get card at pos *offset */
-        list_for_each(next_card, &qeth_ccwgroup_driver.driver.devices){
-                if (i == *offset)
-                        return next_card;
-                i++;
-        }
-        return NULL;
+        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
+                                 qeth_procfile_seq_match);
+
+        /* get card at pos *offset */
+        nr = *offset;
+        while (nr-- > 1 && dev)
+                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
+                                         NULL, qeth_procfile_seq_match);
+        return (void *) dev;
 }
 
 static void
@@ -202,12 +213,14 @@ qeth_perf_procfile_seq_stop(struct seq_file *s, void* it)
 static void *
 qeth_perf_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
 {
-        struct list_head *current_card = (struct list_head *)it;
+        struct device *prev, *next;
 
-        if (current_card->next == &qeth_ccwgroup_driver.driver.devices)
-                return NULL; /* end of list reached */
-        (*offset)++;
-        return current_card->next;
+        prev = (struct device *) it;
+        next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
+                                  NULL, qeth_procfile_seq_match);
+        if (next)
+                (*offset)++;
+        return (void *) next;
 }
 
 static int
@@ -216,7 +229,7 @@ qeth_perf_procfile_seq_show(struct seq_file *s, void *it)
         struct device *device;
         struct qeth_card *card;
 
-        device = list_entry(it, struct device, driver_list);
+        device = (struct device *) it;
         card = device->driver_data;
         seq_printf(s, "For card with devnos %s/%s/%s (%s):\n",
                         CARD_RDEV_ID(card),
@@ -318,8 +331,8 @@ static struct proc_dir_entry *qeth_ipato_procfile;
 static void *
 qeth_ipato_procfile_seq_start(struct seq_file *s, loff_t *offset)
 {
-        struct list_head *next_card = NULL;
-        int i = 0;
+        struct device *dev;
+        loff_t nr;
 
         down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem);
         /* TODO: finish this */
@@ -328,13 +341,16 @@ qeth_ipato_procfile_seq_start(struct seq_file *s, loff_t *offset)
          * output driver settings then;
          * else output setting for respective card
          */
+
+        dev = driver_find_device(&qeth_ccwgroup_driver.driver, NULL, NULL,
+                                 qeth_procfile_seq_match);
+
         /* get card at pos *offset */
-        list_for_each(next_card, &qeth_ccwgroup_driver.driver.devices){
-                if (i == *offset)
-                        return next_card;
-                i++;
-        }
-        return NULL;
+        nr = *offset;
+        while (nr-- > 1 && dev)
+                dev = driver_find_device(&qeth_ccwgroup_driver.driver, dev,
+                                         NULL, qeth_procfile_seq_match);
+        return (void *) dev;
 }
 
 static void
@@ -346,18 +362,14 @@ qeth_ipato_procfile_seq_stop(struct seq_file *s, void* it)
 static void *
 qeth_ipato_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset)
 {
-        struct list_head *current_card = (struct list_head *)it;
+        struct device *prev, *next;
 
-        /* TODO: finish this */
-        /*
-         * maybe SEQ_SATRT_TOKEN can be returned for offset 0
-         * output driver settings then;
-         * else output setting for respective card
-         */
-        if (current_card->next == &qeth_ccwgroup_driver.driver.devices)
-                return NULL; /* end of list reached */
-        (*offset)++;
-        return current_card->next;
+        prev = (struct device *) it;
+        next = driver_find_device(&qeth_ccwgroup_driver.driver, prev,
+                                  NULL, qeth_procfile_seq_match);
+        if (next)
+                (*offset)++;
+        return (void *) next;
 }
 
 static int
@@ -372,7 +384,7 @@ qeth_ipato_procfile_seq_show(struct seq_file *s, void *it)
          * output driver settings then;
          * else output setting for respective card
          */
-        device = list_entry(it, struct device, driver_list);
+        device = (struct device *) it;
         card = device->driver_data;
 
         return 0;