vfio: ccw: improve error handling for vfio_ccw_mdev_remove

When vfio_ccw_mdev_reset fails during the remove process of the mdev,
the current implementation simply returns.

The failure indicates that the subchannel device is in a NOT_OPER state,
thus the right thing to do should be removing the mdev.

While we are at here, reverse the condition check to make the code more
concise and readable.

Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Message-Id: <20170412090816.79108-3-bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c
index 55d0c87e73c3c58161b0238f5143ae4d896923e7..e72abbc18ee31afb2e20808364e7830089f94d15 100644 (file)
--- a/drivers/s390/cio/vfio_ccw_ops.c
+++ b/drivers/s390/cio/vfio_ccw_ops.c
@@ -126,19 +126,14 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)
 {
        struct vfio_ccw_private *private =
                dev_get_drvdata(mdev_parent_dev(mdev));
-       int ret;
-
-       if ((private->state == VFIO_CCW_STATE_NOT_OPER) ||
-           (private->state == VFIO_CCW_STATE_STANDBY))
-               goto out;
-
-       ret = vfio_ccw_mdev_reset(mdev);
-       if (ret)
-               return ret;
 
-       private->state = VFIO_CCW_STATE_STANDBY;
+       if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
+           (private->state != VFIO_CCW_STATE_STANDBY)) {
+               if (!vfio_ccw_mdev_reset(mdev))
+                       private->state = VFIO_CCW_STATE_STANDBY;
+               /* The state will be NOT_OPER on error. */
+       }
 
-out:
        private->mdev = NULL;
        atomic_inc(&private->avail);