[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>
This commit is contained in:
committed by
Linus Torvalds
parent
8129ee1642
commit
a8237fc410
@@ -38,13 +38,13 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
|
||||
"received"
|
||||
" ... device %04X on subchannel %04X, dev_stat "
|
||||
": %02X sch_stat : %02X\n",
|
||||
cdev->private->devno, cdev->private->irq,
|
||||
cdev->private->devno, cdev->private->sch_no,
|
||||
irb->scsw.dstat, irb->scsw.cstat);
|
||||
|
||||
if (irb->scsw.cc != 3) {
|
||||
char dbf_text[15];
|
||||
|
||||
sprintf(dbf_text, "chk%x", cdev->private->irq);
|
||||
sprintf(dbf_text, "chk%x", cdev->private->sch_no);
|
||||
CIO_TRACE_EVENT(0, dbf_text);
|
||||
CIO_HEX_EVENT(0, irb, sizeof (struct irb));
|
||||
}
|
||||
@@ -59,10 +59,10 @@ ccw_device_path_notoper(struct ccw_device *cdev)
|
||||
struct subchannel *sch;
|
||||
|
||||
sch = to_subchannel(cdev->dev.parent);
|
||||
stsch (sch->irq, &sch->schib);
|
||||
stsch (sch->schid, &sch->schib);
|
||||
|
||||
CIO_MSG_EVENT(0, "%s(%04x) - path(s) %02x are "
|
||||
"not operational \n", __FUNCTION__, sch->irq,
|
||||
"not operational \n", __FUNCTION__, sch->schid.sch_no,
|
||||
sch->schib.pmcw.pnom);
|
||||
|
||||
sch->lpm &= ~sch->schib.pmcw.pnom;
|
||||
|
Reference in New Issue
Block a user