Commit ddebf661 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky

s390/qdio: fix double return code evaluation

qdio sometimes checks return codes twice. First with the ccw device's
lock held and then a 2nd time after the lock is released. Simplify
the code by releasing the lock earlier and unify the return code
evaluation.
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a48ed867
...@@ -1375,13 +1375,10 @@ int qdio_establish(struct qdio_initialize *init_data) ...@@ -1375,13 +1375,10 @@ int qdio_establish(struct qdio_initialize *init_data)
ccw_device_set_options_mask(cdev, 0); ccw_device_set_options_mask(cdev, 0);
rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ESTABLISH, 0, 0); rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ESTABLISH, 0, 0);
spin_unlock_irq(get_ccwdev_lock(cdev));
if (rc) { if (rc) {
DBF_ERROR("%4x est IO ERR", irq_ptr->schid.sch_no); DBF_ERROR("%4x est IO ERR", irq_ptr->schid.sch_no);
DBF_ERROR("rc:%4x", rc); DBF_ERROR("rc:%4x", rc);
}
spin_unlock_irq(get_ccwdev_lock(cdev));
if (rc) {
mutex_unlock(&irq_ptr->setup_mutex); mutex_unlock(&irq_ptr->setup_mutex);
qdio_shutdown(cdev, QDIO_FLAG_CLEANUP_USING_CLEAR); qdio_shutdown(cdev, QDIO_FLAG_CLEANUP_USING_CLEAR);
return rc; return rc;
...@@ -1447,14 +1444,12 @@ int qdio_activate(struct ccw_device *cdev) ...@@ -1447,14 +1444,12 @@ int qdio_activate(struct ccw_device *cdev)
rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ACTIVATE, rc = ccw_device_start(cdev, &irq_ptr->ccw, QDIO_DOING_ACTIVATE,
0, DOIO_DENY_PREFETCH); 0, DOIO_DENY_PREFETCH);
spin_unlock_irq(get_ccwdev_lock(cdev));
if (rc) { if (rc) {
DBF_ERROR("%4x act IO ERR", irq_ptr->schid.sch_no); DBF_ERROR("%4x act IO ERR", irq_ptr->schid.sch_no);
DBF_ERROR("rc:%4x", rc); DBF_ERROR("rc:%4x", rc);
}
spin_unlock_irq(get_ccwdev_lock(cdev));
if (rc)
goto out; goto out;
}
if (is_thinint_irq(irq_ptr)) if (is_thinint_irq(irq_ptr))
tiqdio_add_input_queues(irq_ptr); tiqdio_add_input_queues(irq_ptr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment