Commit 416d8d28 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

drivers/block/floppy.c: remove REPEAT macro

Macros with hidden flow changes aren't nice.
Signed-off-by: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 15b2630c
...@@ -2885,7 +2885,6 @@ static int make_raw_rw_request(void) ...@@ -2885,7 +2885,6 @@ static int make_raw_rw_request(void)
static void redo_fd_request(void) static void redo_fd_request(void)
{ {
#define REPEAT {request_done(0); continue; }
int drive; int drive;
int tmp; int tmp;
...@@ -2920,7 +2919,8 @@ static void redo_fd_request(void) ...@@ -2920,7 +2919,8 @@ static void redo_fd_request(void)
if (test_bit(current_drive, &fake_change) || if (test_bit(current_drive, &fake_change) ||
test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) { test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
DPRINT("disk absent or changed during operation\n"); DPRINT("disk absent or changed during operation\n");
REPEAT; request_done(0);
continue;
} }
if (!_floppy) { /* Autodetection */ if (!_floppy) { /* Autodetection */
if (!probing) { if (!probing) {
...@@ -2928,7 +2928,8 @@ static void redo_fd_request(void) ...@@ -2928,7 +2928,8 @@ static void redo_fd_request(void)
if (next_valid_format()) { if (next_valid_format()) {
DPRINT("no autodetectable formats\n"); DPRINT("no autodetectable formats\n");
_floppy = NULL; _floppy = NULL;
REPEAT; request_done(0);
continue;
} }
} }
probing = 1; probing = 1;
...@@ -2949,7 +2950,6 @@ static void redo_fd_request(void) ...@@ -2949,7 +2950,6 @@ static void redo_fd_request(void)
debugt("queue fd request"); debugt("queue fd request");
return; return;
} }
#undef REPEAT
} }
static struct cont_t rw_cont = { static struct cont_t rw_cont = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment