X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=drivers%2Fs390%2Fcio%2Fdevice.c;h=6a58bc8f46e2a20bd170fb458c53b2f77871e3f6;hb=4340393e5a507a9a91bf807a03c73407a1344e20;hp=7ada078ffdd04b09c81cc45ddfab4057f397158d;hpb=8595bb27cebe8b823167fd11b2b506f2e59e83f5;p=linux-2.6-block.git diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 7ada078ffdd0..6a58bc8f46e2 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -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);