Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab50a99 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/cio: remove subchannel_id from ccw_device_private 



A copy of struct subchannel_id is maintained in ccw_device_private.
The subchannel id is a property of the subchannel. The additional
copy is not needed.

Internal users can obtain it from subchannel.schid - device drivers
can use ccw_device_get_schid().

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 9080c924

drivers/s390/cio/device.c

+0 −2
Original line number Diff line number Diff line
@@ -762,7 +762,6 @@ static int io_subchannel_initialize_dev(struct subchannel *sch, 
	priv->state = DEV_STATE_NOT_OPER;

	priv->dev_id.devno = sch->schib.pmcw.dev;

	priv->dev_id.ssid = sch->schid.ssid;

	priv->schid = sch->schid;



	INIT_WORK(&priv->todo_work, ccw_device_todo);

	INIT_LIST_HEAD(&priv->cmb_list);
@@ -1000,7 +999,6 @@ static int ccw_device_move_to_sch(struct ccw_device *cdev, 
	put_device(&old_sch->dev);

	/* Initialize new subchannel. */

	spin_lock_irq(sch->lock);

	cdev->private->schid = sch->schid;

	cdev->ccwlock = sch->lock;

	if (!sch_is_pseudo_sch(sch))

		sch_set_cdev(sch, cdev);

drivers/s390/cio/io_sch.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ struct ccw_device_private { 
	int state;		/* device state */

	atomic_t onoff;

	struct ccw_dev_id dev_id;	/* device id */

	struct subchannel_id schid;	/* subchannel number */

	struct ccw_request req;		/* internal I/O request */

	int iretry;

	u8 pgid_valid_mask;	/* mask of valid PGIDs */