dasd: cleamup dasd_state_basic_to_ready

Reflow dasd_state_basic_to_ready a bit to make it easier to modify.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20240228133742.806274-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 2f3adf5d8fee4427477f74db74f36ff98952a329..e754e4f81b2dff575afdcdc91da3d5867a7d6143 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -307,39 +307,37 @@ static int dasd_state_basic_to_known(struct dasd_device *device)
  */
 static int dasd_state_basic_to_ready(struct dasd_device *device)
 {
-       int rc;
-       struct dasd_block *block;
-       struct gendisk *disk;
+       struct dasd_block *block = device->block;
+       int rc = 0;
 
-       rc = 0;
-       block = device->block;
        /* make disk known with correct capacity */
-       if (block) {
-               if (block->base->discipline->do_analysis != NULL)
-                       rc = block->base->discipline->do_analysis(block);
-               if (rc) {
-                       if (rc != -EAGAIN) {
-                               device->state = DASD_STATE_UNFMT;
-                               disk = device->block->gdp;
-                               kobject_uevent(&disk_to_dev(disk)->kobj,
-                                              KOBJ_CHANGE);
-                               goto out;
-                       }
-                       return rc;
-               }
-               if (device->discipline->setup_blk_queue)
-                       device->discipline->setup_blk_queue(block);
-               set_capacity(block->gdp,
-                            block->blocks << block->s2b_shift);
+       if (!block) {
                device->state = DASD_STATE_READY;
-               rc = dasd_scan_partitions(block);
-               if (rc) {
-                       device->state = DASD_STATE_BASIC;
+               goto out;
+       }
+
+       if (block->base->discipline->do_analysis != NULL)
+               rc = block->base->discipline->do_analysis(block);
+       if (rc) {
+               if (rc == -EAGAIN)
                        return rc;
-               }
-       } else {
-               device->state = DASD_STATE_READY;
+               device->state = DASD_STATE_UNFMT;
+               kobject_uevent(&disk_to_dev(device->block->gdp)->kobj,
+                              KOBJ_CHANGE);
+               goto out;
        }
+
+       if (device->discipline->setup_blk_queue)
+               device->discipline->setup_blk_queue(block);
+       set_capacity(block->gdp, block->blocks << block->s2b_shift);
+       device->state = DASD_STATE_READY;
+
+       rc = dasd_scan_partitions(block);
+       if (rc) {
+               device->state = DASD_STATE_BASIC;
+               return rc;
+       }
+
 out:
        if (device->discipline->basic_to_ready)
                rc = device->discipline->basic_to_ready(device);