drivers/block/floppy.c: unclutter redo_fd_request logic
Joe Perches [Wed, 10 Mar 2010 23:21:03 +0000 (15:21 -0800)]
Change for(;;) with continue; to label: goto label
Reduces indentation and adds a bit of clarity.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/block/floppy.c

index 5d8f551..8e24aa3 100644 (file)
@@ -2892,64 +2892,63 @@ static void redo_fd_request(void)
        if (current_drive < N_DRIVE)
                floppy_off(current_drive);
 
-       for (;;) {
-               if (!current_req) {
-                       struct request *req;
-
-                       spin_lock_irq(floppy_queue->queue_lock);
-                       req = blk_fetch_request(floppy_queue);
-                       spin_unlock_irq(floppy_queue->queue_lock);
-                       if (!req) {
-                               do_floppy = NULL;
-                               unlock_fdc();
-                               return;
-                       }
-                       current_req = req;
-               }
-               drive = (long)current_req->rq_disk->private_data;
-               set_fdc(drive);
-               reschedule_timeout(current_reqD, "redo fd request", 0);
-
-               set_floppy(drive);
-               raw_cmd = &default_raw_cmd;
-               raw_cmd->flags = 0;
-               if (start_motor(redo_fd_request))
+do_request:
+       if (!current_req) {
+               struct request *req;
+
+               spin_lock_irq(floppy_queue->queue_lock);
+               req = blk_fetch_request(floppy_queue);
+               spin_unlock_irq(floppy_queue->queue_lock);
+               if (!req) {
+                       do_floppy = NULL;
+                       unlock_fdc();
                        return;
-               disk_change(current_drive);
-               if (test_bit(current_drive, &fake_change) ||
-                   test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
-                       DPRINT("disk absent or changed during operation\n");
-                       request_done(0);
-                       continue;
-               }
-               if (!_floppy) { /* Autodetection */
-                       if (!probing) {
-                               DRS->probed_format = 0;
-                               if (next_valid_format()) {
-                                       DPRINT("no autodetectable formats\n");
-                                       _floppy = NULL;
-                                       request_done(0);
-                                       continue;
-                               }
-                       }
-                       probing = 1;
-                       _floppy =
-                           floppy_type + DP->autodetect[DRS->probed_format];
-               } else
-                       probing = 0;
-               errors = &(current_req->errors);
-               tmp = make_raw_rw_request();
-               if (tmp < 2) {
-                       request_done(tmp);
-                       continue;
                }
+               current_req = req;
+       }
+       drive = (long)current_req->rq_disk->private_data;
+       set_fdc(drive);
+       reschedule_timeout(current_reqD, "redo fd request", 0);
 
-               if (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags))
-                       twaddle();
-               schedule_bh(floppy_start);
-               debugt("queue fd request");
+       set_floppy(drive);
+       raw_cmd = &default_raw_cmd;
+       raw_cmd->flags = 0;
+       if (start_motor(redo_fd_request))
                return;
+
+       disk_change(current_drive);
+       if (test_bit(current_drive, &fake_change) ||
+           test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
+               DPRINT("disk absent or changed during operation\n");
+               request_done(0);
+               goto do_request;
        }
+       if (!_floppy) { /* Autodetection */
+               if (!probing) {
+                       DRS->probed_format = 0;
+                       if (next_valid_format()) {
+                               DPRINT("no autodetectable formats\n");
+                               _floppy = NULL;
+                               request_done(0);
+                               goto do_request;
+                       }
+               }
+               probing = 1;
+               _floppy = floppy_type + DP->autodetect[DRS->probed_format];
+       } else
+               probing = 0;
+       errors = &(current_req->errors);
+       tmp = make_raw_rw_request();
+       if (tmp < 2) {
+               request_done(tmp);
+               goto do_request;
+       }
+
+       if (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags))
+               twaddle();
+       schedule_bh(floppy_start);
+       debugt("queue fd request");
+       return;
 }
 
 static struct cont_t rw_cont = {