Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

1 files changed, 14 insertions, 20 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 87bd70eeabed..555119cacc27 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -128,34 +128,28 @@ css_probe_device(int irq)
         return ret;
 }
 
+static int
+check_subchannel(struct device * dev, void * data)
+{
+        struct subchannel *sch;
+        int irq = (unsigned long)data;
+
+        sch = to_subchannel(dev);
+        return (sch->irq == irq);
+}
+
 struct subchannel *
 get_subchannel_by_schid(int irq)
 {
-        struct subchannel *sch;
-        struct list_head *entry;
         struct device *dev;
 
-        if (!get_bus(&css_bus_type))
-                return NULL;
-        down_read(&css_bus_type.subsys.rwsem);
-        sch = NULL;
-        list_for_each(entry, &css_bus_type.devices.list) {
-                dev = get_device(container_of(entry,
-                                              struct device, bus_list));
-                if (!dev)
-                        continue;
-                sch = to_subchannel(dev);
-                if (sch->irq == irq)
-                        break;
-                put_device(dev);
-                sch = NULL;
-        }
-        up_read(&css_bus_type.subsys.rwsem);
-        put_bus(&css_bus_type);
+        dev = bus_find_device(&css_bus_type, NULL,
+                              (void *)(unsigned long)irq, check_subchannel);
 
-        return sch;
+        return dev ? to_subchannel(dev) : NULL;
 }
 
+
 static inline int
 css_get_subchannel_status(struct subchannel *sch, int schid)
 {