lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] cio: consolidate subchannel intparm reset

Browse Source 
Ensure that the hardware interruption parameter for a subchannel is
reset when the associated subchannel data structure is freed.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Peter Oberparleiter
2009-09-11 10:28:16 +02:00
committed by Martin Schwidefsky
parent 62733e5a5a
commit 1da73bc80b
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/s390/cio/css.c
View File

@@ -170,6 +170,9 @@ css_subchannel_release(struct device *dev)
sch = to_subchannel(dev); sch = to_subchannel(dev);
if (!cio_is_console(sch->schid)) { if (!cio_is_console(sch->schid)) {
/* Reset intparm to zeroes. */
sch->config.intparm = 0;
cio_commit_config(sch);
kfree(sch->lock); kfree(sch->lock);
kfree(sch); kfree(sch);
} }

10
drivers/s390/cio/device.c
View File

@@ -1024,9 +1024,6 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)
return; return;
sch = to_subchannel(cdev->dev.parent); sch = to_subchannel(cdev->dev.parent);
css_sch_device_unregister(sch); css_sch_device_unregister(sch);
/* Reset intparm to zeroes. */
sch->config.intparm = 0;
cio_commit_config(sch);
/* Release cdev reference for workqueue processing.*/ /* Release cdev reference for workqueue processing.*/
put_device(&cdev->dev); put_device(&cdev->dev);
/* Release subchannel reference for local processing. */ /* Release subchannel reference for local processing. */
@@ -1210,9 +1207,6 @@ static void io_subchannel_do_unreg(struct work_struct *work)
sch = container_of(work, struct subchannel, work); sch = container_of(work, struct subchannel, work);
css_sch_device_unregister(sch); css_sch_device_unregister(sch);
/* Reset intparm to zeroes. */
sch->config.intparm = 0;
cio_commit_config(sch);
put_device(&sch->dev); put_device(&sch->dev);
} }
@@ -1688,10 +1682,6 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
spin_unlock_irqrestore(sch->lock, flags); spin_unlock_irqrestore(sch->lock, flags);
css_sch_device_unregister(sch); css_sch_device_unregister(sch);
spin_lock_irqsave(sch->lock, flags); spin_lock_irqsave(sch->lock, flags);
/* Reset intparm to zeroes. */
sch->config.intparm = 0;
cio_commit_config(sch);
break; break;
case REPROBE: case REPROBE:
ccw_device_trigger_reprobe(cdev); ccw_device_trigger_reprobe(cdev);