Skip to content

Commit

Permalink
[S390] cio: remove lock from ccw_device_oper_notify.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Ott authored and Heiko Carstens committed Jul 14, 2008
1 parent 23f6268 commit ae437a4
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/s390/cio/device_fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit ae437a4

Please sign in to comment.