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

Commit ae437a45 authored by Sebastian Ott's avatar Sebastian Ott Committed by Heiko Carstens
Browse files

[S390] cio: remove lock from ccw_device_oper_notify. 



Remove unnecessary ccw device locking inside ccw_device_oper_notify.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 23f62689

drivers/s390/cio/device_fsm.c

+1 −7
Original line number Diff line number Diff line
@@ -346,21 +346,15 @@ ccw_device_oper_notify(struct work_struct *work) 
	struct ccw_device_private *priv;

	struct ccw_device *cdev;

	int ret;

	unsigned long flags;



	priv = container_of(work, struct ccw_device_private, kick_work);

	cdev = priv->cdev;

	ret = ccw_device_notify(cdev, CIO_OPER);

	spin_lock_irqsave(cdev->ccwlock, flags);

	if (ret) {

		/* Reenable channel measurements, if needed. */

		spin_unlock_irqrestore(cdev->ccwlock, flags);

		cmf_reenable(cdev);

		spin_lock_irqsave(cdev->ccwlock, flags);

		wake_up(&cdev->private->wait_q);

	}

	spin_unlock_irqrestore(cdev->ccwlock, flags);

	if (!ret)

	} else

		/* Driver doesn't want device back. */

		ccw_device_do_unreg_rereg(work);

}