aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-10 18:21:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 18:52:30 -0500
commit416d8d2888db392c562fb8afaf9136730ef0da9e (patch)
tree0643f05cfb24aa543ea4439c35ff0400dfb268bf /drivers/block/floppy.c
parent15b2630c587dcea931f563deb50d617af96b4edb (diff)
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>
Diffstat (limited to 'drivers/block/floppy.c')
-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 00f3910e2d53..5d8f5510ebc5 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2885,7 +2885,6 @@ static int make_raw_rw_request(void)
2885 2885
2886static void redo_fd_request(void) 2886static void redo_fd_request(void)
2887{ 2887{
2888#define REPEAT {request_done(0); continue; }
2889 int drive; 2888 int drive;
2890 int tmp; 2889 int tmp;
2891 2890
@@ -2920,7 +2919,8 @@ static void redo_fd_request(void)
2920 if (test_bit(current_drive, &fake_change) || 2919 if (test_bit(current_drive, &fake_change) ||
2921 test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) { 2920 test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
2922 DPRINT("disk absent or changed during operation\n"); 2921 DPRINT("disk absent or changed during operation\n");
2923 REPEAT; 2922 request_done(0);
2923 continue;
2924 } 2924 }
2925 if (!_floppy) { /* Autodetection */ 2925 if (!_floppy) { /* Autodetection */
2926 if (!probing) { 2926 if (!probing) {
@@ -2928,7 +2928,8 @@ static void redo_fd_request(void)
2928 if (next_valid_format()) { 2928 if (next_valid_format()) {
2929 DPRINT("no autodetectable formats\n"); 2929 DPRINT("no autodetectable formats\n");
2930 _floppy = NULL; 2930 _floppy = NULL;
2931 REPEAT; 2931 request_done(0);
2932 continue;
2932 } 2933 }
2933 } 2934 }
2934 probing = 1; 2935 probing = 1;
@@ -2949,7 +2950,6 @@ static void redo_fd_request(void)
2949 debugt("queue fd request"); 2950 debugt("queue fd request");
2950 return; 2951 return;
2951 } 2952 }
2952#undef REPEAT
2953} 2953}
2954 2954
2955static struct cont_t rw_cont = { 2955static struct cont_t rw_cont = {