From 6e9a0f67deeca90c433ac40b887cee8da3bdcea2 Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Mon, 7 Dec 2009 12:51:38 +0100 Subject: [PATCH] [S390] cio: quiesce subchannel in io_subchannel_remove Ensure that there will be no more interrupts for an unregistered device by using the same quiesce and disable loop as in io_subchannel_shutdown. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky --- drivers/s390/cio/device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index af500aac24ef..bd6e8cf77fad 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1059,6 +1059,8 @@ out_schedule: return 0; } +static void io_subchannel_quiesce(struct subchannel *); + static int io_subchannel_remove (struct subchannel *sch) { @@ -1068,6 +1070,7 @@ io_subchannel_remove (struct subchannel *sch) 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); sch_set_cdev(sch, NULL); @@ -1150,7 +1153,7 @@ static int io_subchannel_chp_event(struct subchannel *sch, return 0; } -static void io_subchannel_shutdown(struct subchannel *sch) +static void io_subchannel_quiesce(struct subchannel *sch) { struct ccw_device *cdev; int ret; @@ -1182,6 +1185,11 @@ out_unlock: spin_unlock_irq(sch->lock); } +static void io_subchannel_shutdown(struct subchannel *sch) +{ + io_subchannel_quiesce(sch); +} + static int device_is_disconnected(struct ccw_device *cdev) { if (!cdev) -- 2.20.1