Commit 7de6a63c authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky

s390/cio: stop using subchannel_id from ccw_device_private

We want to get rid of the copy of struct subchannel_id maintained in
ccw_device_private, so obtain it from the subchannel directly.
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6e127efe
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
static void static void
ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb) ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
{ {
struct subchannel *sch = to_subchannel(cdev->dev.parent);
char dbf_text[15]; char dbf_text[15];
if (!scsw_is_valid_cstat(&irb->scsw) || if (!scsw_is_valid_cstat(&irb->scsw) ||
...@@ -36,10 +37,10 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb) ...@@ -36,10 +37,10 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
"received" "received"
" ... device %04x on subchannel 0.%x.%04x, dev_stat " " ... device %04x on subchannel 0.%x.%04x, dev_stat "
": %02X sch_stat : %02X\n", ": %02X sch_stat : %02X\n",
cdev->private->dev_id.devno, cdev->private->schid.ssid, cdev->private->dev_id.devno, sch->schid.ssid,
cdev->private->schid.sch_no, sch->schid.sch_no,
scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw)); scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw));
sprintf(dbf_text, "chk%x", cdev->private->schid.sch_no); sprintf(dbf_text, "chk%x", sch->schid.sch_no);
CIO_TRACE_EVENT(0, dbf_text); CIO_TRACE_EVENT(0, dbf_text);
CIO_HEX_EVENT(0, irb, sizeof(struct irb)); CIO_HEX_EVENT(0, irb, sizeof(struct irb));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment