Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1da73bc8 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Martin Schwidefsky
Browse files

[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: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 62733e5a

drivers/s390/cio/css.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	}

drivers/s390/cio/device.c

+0 −10
Original line number Diff line number Diff line
@@ -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);