[S390] css: Use css_device_id for bus matching.

css_device_id exists, so use it for determining the right driver
(and add a match_flags which is always 1 for valid types).

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

3 files changed, 14 insertions, 11 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 45ba07c0a286..4e2f2bbf4ba5 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -850,19 +850,16 @@ int sch_is_pseudo_sch(struct subchannel *sch)
         return sch == to_css(sch->dev.parent)->pseudo_subchannel;
 }
 
-/*
- * find a driver for a subchannel. They identify by the subchannel
- * type with the exception that the console subchannel driver has its own
- * subchannel type although the device is an i/o subchannel
- */
-static int
-css_bus_match (struct device *dev, struct device_driver *drv)
+static int css_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct subchannel *sch = to_subchannel(dev);
         struct css_driver *driver = to_cssdriver(drv);
+        struct css_device_id *id;
 
-        if (sch->st == driver->subchannel_type)
-                return 1;
+        for (id = driver->subchannel_type; id->match_flags; id++) {
+                if (sch->st == id->type)
+                        return 1;
+        }
 
         return 0;
 }
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 38bf9ddb8412..58020bf41ed0 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -75,7 +75,7 @@ struct chp_link;
  */
 struct css_driver {
         struct module *owner;
-        unsigned int subchannel_type;
+        struct css_device_id *subchannel_type;
         struct device_driver drv;
         void (*irq)(struct subchannel *);
         int (*chp_event)(struct subchannel *, struct chp_link *, int);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 522d47afc950..c904cb84d75e 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -131,9 +131,15 @@ static int io_subchannel_sch_event(struct subchannel *, int);
 static int io_subchannel_chp_event(struct subchannel *, struct chp_link *,
                                    int);
 
+static struct css_device_id io_subchannel_ids[] = {
+        { .match_flags = 0x1, .type = SUBCHANNEL_TYPE_IO, },
+        { /* end of list */ },
+};
+MODULE_DEVICE_TABLE(css, io_subchannel_ids);
+
 static struct css_driver io_subchannel_driver = {
         .owner = THIS_MODULE,
-        .subchannel_type = SUBCHANNEL_TYPE_IO,
+        .subchannel_type = io_subchannel_ids,
         .name = "io_subchannel",
         .irq = io_subchannel_irq,
         .sch_event = io_subchannel_sch_event,