[S390] Some preparations for the dynamic subchannel mapping patch.

- Move adding subchannel attributes to css_register_subchannel().
- Don't call device_trigger_reprobe() for non-operational devices.
- Introduce io_subchannel_create_ccwdev().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 26cf2f5ae2e7..55895c83d499 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -135,14 +135,19 @@ css_register_subchannel(struct subchannel *sch)
         sch->dev.parent = &css[0]->device;
         sch->dev.bus = &css_bus_type;
         sch->dev.release = &css_subchannel_release;
-        
+
         /* make it known to the system */
         ret = css_sch_device_register(sch);
-        if (ret)
+        if (ret) {
                 printk (KERN_WARNING "%s: could not register %s\n",
                         __func__, sch->dev.bus_id);
-        else
-                css_get_ssd_info(sch);
+                return ret;
+        }
+        css_get_ssd_info(sch);
+        ret = subchannel_add_files(&sch->dev);
+        if (ret)
+                printk(KERN_WARNING "%s: could not add attributes to %s\n",
+                       __func__, sch->dev.bus_id);
         return ret;
 }