redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

s390/cio: remove subchannel_id from ccw_device_private

Browse source 
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: 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>
This commit is contained in:
Sebastian Ott 2016-07-29 10:43:53 +02:00 committed by Martin Schwidefsky
parent 9080c92494
commit 1ab50a99f8
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/s390/cio/device.c
View file

@ -762,7 +762,6 @@ static int io_subchannel_initialize_dev(struct subchannel *sch,
priv->state = DEV_STATE_NOT_OPER; priv->state = DEV_STATE_NOT_OPER;
priv->dev_id.devno = sch->schib.pmcw.dev; priv->dev_id.devno = sch->schib.pmcw.dev;
priv->dev_id.ssid = sch->schid.ssid; priv->dev_id.ssid = sch->schid.ssid;
priv->schid = sch->schid;
INIT_WORK(&priv->todo_work, ccw_device_todo); INIT_WORK(&priv->todo_work, ccw_device_todo);
INIT_LIST_HEAD(&priv->cmb_list); 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); put_device(&old_sch->dev);
/* Initialize new subchannel. */ /* Initialize new subchannel. */
spin_lock_irq(sch->lock); spin_lock_irq(sch->lock);
cdev->private->schid = sch->schid;
cdev->ccwlock = sch->lock; cdev->ccwlock = sch->lock;
if (!sch_is_pseudo_sch(sch)) if (!sch_is_pseudo_sch(sch))
sch_set_cdev(sch, cdev); sch_set_cdev(sch, cdev);

1
drivers/s390/cio/io_sch.h
View file

@ -120,7 +120,6 @@ struct ccw_device_private {
int state; /* device state */ int state; /* device state */
atomic_t onoff; atomic_t onoff;
struct ccw_dev_id dev_id; /* device id */ struct ccw_dev_id dev_id; /* device id */
struct subchannel_id schid; /* subchannel number */
struct ccw_request req; /* internal I/O request */ struct ccw_request req; /* internal I/O request */
int iretry; int iretry;
u8 pgid_valid_mask; /* mask of valid PGIDs */ u8 pgid_valid_mask; /* mask of valid PGIDs */