[PATCH] s390: introduce struct subchannel_id

This patch introduces a struct subchannel_id containing the subchannel number
(formerly referred to as "irq") and switches code formerly relying on the
subchannel number over to it.

While we're touching inline assemblies anyway, make sure they have correct
memory constraints.

Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 0e68fb511dc9..207881ec7aaf 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -258,7 +258,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                  */
                 CIO_MSG_EVENT(2, "SenseID : device %04x on Subchannel %04x "
                               "reports cmd reject\n",
-                              cdev->private->devno, sch->irq);
+                              cdev->private->devno, sch->schid.sch_no);
                 return -EOPNOTSUPP;
         }
         if (irb->esw.esw0.erw.cons) {
@@ -280,13 +280,13 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                         CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x on"
                                       " subchannel %04x is 'not operational'\n",
                                       sch->orb.lpm, cdev->private->devno,
-                                      sch->irq);
+                                      sch->schid.sch_no);
                 return -EACCES;
         }
         /* Hmm, whatever happened, try again. */
         CIO_MSG_EVENT(2, "SenseID : start_IO() for device %04x on "
                       "subchannel %04x returns status %02X%02X\n",
-                      cdev->private->devno, sch->irq,
+                      cdev->private->devno, sch->schid.sch_no,
                       irb->scsw.dstat, irb->scsw.cstat);
         return -EAGAIN;
 }