forked from luck/tmp_suning_uos_patched
[S390] cio: consolidate subchannel intparm reset
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:
parent
62733e5a5a
commit
1da73bc80b
@ -170,6 +170,9 @@ css_subchannel_release(struct device *dev)
|
||||
|
||||
sch = to_subchannel(dev);
|
||||
if (!cio_is_console(sch->schid)) {
|
||||
/* Reset intparm to zeroes. */
|
||||
sch->config.intparm = 0;
|
||||
cio_commit_config(sch);
|
||||
kfree(sch->lock);
|
||||
kfree(sch);
|
||||
}
|
||||
|
@ -1024,9 +1024,6 @@ static void ccw_device_call_sch_unregister(struct work_struct *work)
|
||||
return;
|
||||
sch = to_subchannel(cdev->dev.parent);
|
||||
css_sch_device_unregister(sch);
|
||||
/* Reset intparm to zeroes. */
|
||||
sch->config.intparm = 0;
|
||||
cio_commit_config(sch);
|
||||
/* Release cdev reference for workqueue processing.*/
|
||||
put_device(&cdev->dev);
|
||||
/* 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);
|
||||
css_sch_device_unregister(sch);
|
||||
/* Reset intparm to zeroes. */
|
||||
sch->config.intparm = 0;
|
||||
cio_commit_config(sch);
|
||||
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);
|
||||
css_sch_device_unregister(sch);
|
||||
spin_lock_irqsave(sch->lock, flags);
|
||||
|
||||
/* Reset intparm to zeroes. */
|
||||
sch->config.intparm = 0;
|
||||
cio_commit_config(sch);
|
||||
break;
|
||||
case REPROBE:
|
||||
ccw_device_trigger_reprobe(cdev);
|
||||
|
Loading…
Reference in New Issue
Block a user