lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/block/floppy.c: unclutter redo_fd_request logic

Browse Source 
Change for(;;) with continue; to label: goto label
Reduces indentation and adds a bit of clarity.

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>
This commit is contained in:
Joe Perches
2010-03-10 15:21:03 -08:00
committed by Linus Torvalds
parent 416d8d2888
commit 0da3132f90
1 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/floppy.c
View File

@@ -2892,7 +2892,7 @@ static void redo_fd_request(void)
if (current_drive < N_DRIVE) if (current_drive < N_DRIVE)
floppy_off(current_drive); floppy_off(current_drive);
for (;;) { do_request:
if (!current_req) { if (!current_req) {
struct request *req; struct request *req;
@@ -2915,12 +2915,13 @@ static void redo_fd_request(void)
raw_cmd->flags = 0; raw_cmd->flags = 0;
if (start_motor(redo_fd_request)) if (start_motor(redo_fd_request))
return; return;
disk_change(current_drive); disk_change(current_drive);
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");
request_done(0); request_done(0);
continue; goto do_request;
} }
if (!_floppy) { /* Autodetection */ if (!_floppy) { /* Autodetection */
if (!probing) { if (!probing) {
@@ -2929,19 +2930,18 @@ static void redo_fd_request(void)
DPRINT("no autodetectable formats\n"); DPRINT("no autodetectable formats\n");
_floppy = NULL; _floppy = NULL;
request_done(0); request_done(0);
continue; goto do_request;
} }
} }
probing = 1; probing = 1;
_floppy = _floppy = floppy_type + DP->autodetect[DRS->probed_format];
floppy_type + DP->autodetect[DRS->probed_format];
} else } else
probing = 0; probing = 0;
errors = &(current_req->errors); errors = &(current_req->errors);
tmp = make_raw_rw_request(); tmp = make_raw_rw_request();
if (tmp < 2) { if (tmp < 2) {
request_done(tmp); request_done(tmp);
continue; goto do_request;
} }
if (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags)) if (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags))
@@ -2950,7 +2950,6 @@ static void redo_fd_request(void)
debugt("queue fd request"); debugt("queue fd request");
return; return;
} }
}
static struct cont_t rw_cont = { static struct cont_t rw_cont = {
.interrupt = rw_interrupt, .interrupt = rw_interrupt,