drivers/block/floppy.c: remove REPEAT macro
Joe Perches [Wed, 10 Mar 2010 23:21:02 +0000 (15:21 -0800)]
Macros with hidden flow changes aren't nice.

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 00f3910..5d8f551 100644 (file)
@@ -2885,7 +2885,6 @@ static int make_raw_rw_request(void)
 
 static void redo_fd_request(void)
 {
-#define REPEAT {request_done(0); continue; }
        int drive;
        int tmp;
 
@@ -2920,7 +2919,8 @@ static void redo_fd_request(void)
                if (test_bit(current_drive, &fake_change) ||
                    test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
                        DPRINT("disk absent or changed during operation\n");
-                       REPEAT;
+                       request_done(0);
+                       continue;
                }
                if (!_floppy) { /* Autodetection */
                        if (!probing) {
@@ -2928,7 +2928,8 @@ static void redo_fd_request(void)
                                if (next_valid_format()) {
                                        DPRINT("no autodetectable formats\n");
                                        _floppy = NULL;
-                                       REPEAT;
+                                       request_done(0);
+                                       continue;
                                }
                        }
                        probing = 1;
@@ -2949,7 +2950,6 @@ static void redo_fd_request(void)
                debugt("queue fd request");
                return;
        }
-#undef REPEAT
 }
 
 static struct cont_t rw_cont = {