diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2008-07-14 09:58:53 +0200 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 10:02:08 +0200 |
| commit | ae437a452ed20f9d13c1f17b0356201d54394efa (patch) | |
| tree | 65623b52c160f3d1651587fcb20e8bef20a326a7 | |
| parent | 23f626894765d4c03b72a0d21e44bc46f5ccd12b (diff) | |
| download | blackbird-obmc-linux-ae437a452ed20f9d13c1f17b0356201d54394efa.tar.gz blackbird-obmc-linux-ae437a452ed20f9d13c1f17b0356201d54394efa.zip | |
[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>
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index cd31bb5177e6..8b5fe57fb2f3 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -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); } |
