|
@@ -1065,17 +1065,16 @@ static int
|
|
|
io_subchannel_remove (struct subchannel *sch)
|
|
|
{
|
|
|
struct ccw_device *cdev;
|
|
|
- unsigned long flags;
|
|
|
|
|
|
cdev = sch_get_cdev(sch);
|
|
|
if (!cdev)
|
|
|
goto out_free;
|
|
|
io_subchannel_quiesce(sch);
|
|
|
/* Set ccw device to not operational and drop reference. */
|
|
|
- spin_lock_irqsave(cdev->ccwlock, flags);
|
|
|
+ spin_lock_irq(cdev->ccwlock);
|
|
|
sch_set_cdev(sch, NULL);
|
|
|
cdev->private->state = DEV_STATE_NOT_OPER;
|
|
|
- spin_unlock_irqrestore(cdev->ccwlock, flags);
|
|
|
+ spin_unlock_irq(cdev->ccwlock);
|
|
|
ccw_device_unregister(cdev);
|
|
|
out_free:
|
|
|
kfree(sch->private);
|