Rework scsi_internal_device_unblock_nowait() into using a
switch statement.
No functional changes.

Signed-off-by: Hannes Reinecke <h...@suse.com>
Reviewed-by: Christoph Hellwig <h...@lst.de>
Reviewed-by: Johannes Thumshirn <jthumsh...@suse.de>
---
 drivers/scsi/scsi_lib.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1ae531b..9169396 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -3074,19 +3074,24 @@ int scsi_internal_device_unblock_nowait(struct 
scsi_device *sdev,
         * Try to transition the scsi device to SDEV_RUNNING or one of the
         * offlined states and goose the device queue if successful.
         */
-       if ((sdev->sdev_state == SDEV_BLOCK) ||
-           (sdev->sdev_state == SDEV_TRANSPORT_OFFLINE))
+       switch (sdev->sdev_state) {
+       case SDEV_BLOCK:
+       case SDEV_TRANSPORT_OFFLINE:
                sdev->sdev_state = new_state;
-       else if (sdev->sdev_state == SDEV_CREATED_BLOCK) {
+               break;
+       case SDEV_CREATED_BLOCK:
                if (new_state == SDEV_TRANSPORT_OFFLINE ||
                    new_state == SDEV_OFFLINE)
                        sdev->sdev_state = new_state;
                else
                        sdev->sdev_state = SDEV_CREATED;
-       } else if (sdev->sdev_state != SDEV_CANCEL &&
-                sdev->sdev_state != SDEV_OFFLINE)
+               break;
+       case SDEV_CANCEL:
+       case SDEV_OFFLINE:
+               break;
+       default:
                return -EINVAL;
-
+       }
        scsi_start_queue(sdev);
 
        return 0;
-- 
1.8.5.6

Reply via email to