Skip to content

Commit

Permalink
drivers/block/floppy.c: remove REPEAT macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 12, 2010
1 parent 15b2630 commit 416d8d2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -2920,15 +2919,17 @@ 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) {
DRS->probed_format = 0;
if (next_valid_format()) {
DPRINT("no autodetectable formats\n");
_floppy = NULL;
REPEAT;
request_done(0);
continue;
}
}
probing = 1;
Expand All @@ -2949,7 +2950,6 @@ static void redo_fd_request(void)
debugt("queue fd request");
return;
}
#undef REPEAT
}

static struct cont_t rw_cont = {
Expand Down

0 comments on commit 416d8d2

Please sign in to comment.