Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Sebastian Ott and committed by
Martin Schwidefsky
7de6a63c 6e127efe

+4 -3
+4 -3
drivers/s390/cio/device_status.c
··· 26 26 static void 27 27 ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb) 28 28 { 29 + struct subchannel *sch = to_subchannel(cdev->dev.parent); 29 30 char dbf_text[15]; 30 31 31 32 if (!scsw_is_valid_cstat(&irb->scsw) || ··· 37 36 "received" 38 37 " ... device %04x on subchannel 0.%x.%04x, dev_stat " 39 38 ": %02X sch_stat : %02X\n", 40 - cdev->private->dev_id.devno, cdev->private->schid.ssid, 41 - cdev->private->schid.sch_no, 39 + cdev->private->dev_id.devno, sch->schid.ssid, 40 + sch->schid.sch_no, 42 41 scsw_dstat(&irb->scsw), scsw_cstat(&irb->scsw)); 43 - sprintf(dbf_text, "chk%x", cdev->private->schid.sch_no); 42 + sprintf(dbf_text, "chk%x", sch->schid.sch_no); 44 43 CIO_TRACE_EVENT(0, dbf_text); 45 44 CIO_HEX_EVENT(0, irb, sizeof(struct irb)); 46 45 }