summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-10 15:21:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 15:52:30 -0800
commit416d8d2888db392c562fb8afaf9136730ef0da9e (patch)
tree0643f05cfb24aa543ea4439c35ff0400dfb268bf
parent15b2630c587dcea931f563deb50d617af96b4edb (diff)
downloadop-kernel-dev-416d8d2888db392c562fb8afaf9136730ef0da9e.zip
op-kernel-dev-416d8d2888db392c562fb8afaf9136730ef0da9e.tar.gz
drivers/block/floppy.c: remove REPEAT macro
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>
-rw-r--r--drivers/block/floppy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 00f3910..5d8f551 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -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 = {
OpenPOWER on IntegriCloud