[S390] cio: remove lock from ccw_device_oper_notify.

Remove unnecessary ccw device locking inside ccw_device_oper_notify.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Sebastian Ott 2008-07-14 09:58:53 +02:00 committed by Heiko Carstens
parent 23f6268947
commit ae437a452e

View File

@ -346,21 +346,15 @@ ccw_device_oper_notify(struct work_struct *work)
struct ccw_device_private *priv; struct ccw_device_private *priv;
struct ccw_device *cdev; struct ccw_device *cdev;
int ret; int ret;
unsigned long flags;
priv = container_of(work, struct ccw_device_private, kick_work); priv = container_of(work, struct ccw_device_private, kick_work);
cdev = priv->cdev; cdev = priv->cdev;
ret = ccw_device_notify(cdev, CIO_OPER); ret = ccw_device_notify(cdev, CIO_OPER);
spin_lock_irqsave(cdev->ccwlock, flags);
if (ret) { if (ret) {
/* Reenable channel measurements, if needed. */ /* Reenable channel measurements, if needed. */
spin_unlock_irqrestore(cdev->ccwlock, flags);
cmf_reenable(cdev); cmf_reenable(cdev);
spin_lock_irqsave(cdev->ccwlock, flags);
wake_up(&cdev->private->wait_q); wake_up(&cdev->private->wait_q);
} } else
spin_unlock_irqrestore(cdev->ccwlock, flags);
if (!ret)
/* Driver doesn't want device back. */ /* Driver doesn't want device back. */
ccw_device_do_unreg_rereg(work); ccw_device_do_unreg_rereg(work);
} }