[S390] cio: change locking in io_subchannel_remove

IO subchannels are always unregistered in process context, so use
spin_lock_irq in the corresponding remove callback.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index bd6e8cf77fad..dc97cb9f227f 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -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);