[S390] cio: I/O subchannel specific fields.

Some fields may be !0 only for I/O subchannels. Add some checks
where required. Also adapt cio_enable_subchannel() to make the
caller specify the intparm, which makes it more generic.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 44ce7a3d3857..4804d944fb4d 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -553,7 +553,8 @@ ccw_device_recognition(struct ccw_device *cdev)
             (cdev->private->state != DEV_STATE_BOXED))
                 return -EINVAL;
         sch = to_subchannel(cdev->dev.parent);
-        ret = cio_enable_subchannel(sch, sch->schib.pmcw.isc);
+        ret = cio_enable_subchannel(sch, sch->schib.pmcw.isc,
+                                    (u32)(addr_t)sch);
         if (ret != 0)
                 /* Couldn't enable the subchannel for i/o. Sick device. */
                 return ret;
@@ -663,7 +664,8 @@ ccw_device_online(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         if (css_init_done && !get_device(&cdev->dev))
                 return -ENODEV;
-        ret = cio_enable_subchannel(sch, sch->schib.pmcw.isc);
+        ret = cio_enable_subchannel(sch, sch->schib.pmcw.isc,
+                                    (u32)(addr_t)sch);
         if (ret != 0) {
                 /* Couldn't enable the subchannel for i/o. Sick device. */
                 if (ret == -ENODEV)
@@ -1043,7 +1045,8 @@ ccw_device_start_id(struct ccw_device *cdev, enum dev_event dev_event)
         struct subchannel *sch;
 
         sch = to_subchannel(cdev->dev.parent);
-        if (cio_enable_subchannel(sch, sch->schib.pmcw.isc) != 0)
+        if (cio_enable_subchannel(sch, sch->schib.pmcw.isc,
+                                  (u32)(addr_t)sch) != 0)
                 /* Couldn't enable the subchannel for i/o. Sick device. */
                 return;