[S390] cio: introduce fcx enabled scsw format

Extend the scsw data structure to the format required by fcx. Also
provide helper functions for easier access to fields which are present
in both the traditional as well as the modified format.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 2808b6833b9e..6c77c2326bd4 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -341,12 +341,12 @@ static int cmf_copy_block(struct ccw_device *cdev)
         if (stsch(sch->schid, &sch->schib))
                 return -ENODEV;
 
-        if (sch->schib.scsw.fctl & SCSW_FCTL_START_FUNC) {
+        if (scsw_fctl(&sch->schib.scsw) & SCSW_FCTL_START_FUNC) {
                 /* Don't copy if a start function is in progress. */
-                if ((!(sch->schib.scsw.actl & SCSW_ACTL_SUSPENDED)) &&
-                    (sch->schib.scsw.actl &
+                if ((!(scsw_actl(&sch->schib.scsw) & SCSW_ACTL_SUSPENDED)) &&
+                    (scsw_actl(&sch->schib.scsw) &
                      (SCSW_ACTL_DEVACT | SCSW_ACTL_SCHACT)) &&
-                    (!(sch->schib.scsw.stctl & SCSW_STCTL_SEC_STATUS)))
+                    (!(scsw_stctl(&sch->schib.scsw) & SCSW_STCTL_SEC_STATUS)))
                         return -EBUSY;
         }
         cmb_data = cdev->private->cmb;