drivers/block/floppy.c: unclutter redo_fd_request logic
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:
Родитель
416d8d2888
Коммит
0da3132f90
|
@ -2892,7 +2892,7 @@ static void redo_fd_request(void)
|
|||
if (current_drive < N_DRIVE)
|
||||
floppy_off(current_drive);
|
||||
|
||||
for (;;) {
|
||||
do_request:
|
||||
if (!current_req) {
|
||||
struct request *req;
|
||||
|
||||
|
@ -2915,12 +2915,13 @@ static void redo_fd_request(void)
|
|||
raw_cmd->flags = 0;
|
||||
if (start_motor(redo_fd_request))
|
||||
return;
|
||||
|
||||
disk_change(current_drive);
|
||||
if (test_bit(current_drive, &fake_change) ||
|
||||
test_bit(FD_DISK_CHANGED_BIT, &DRS->flags)) {
|
||||
DPRINT("disk absent or changed during operation\n");
|
||||
request_done(0);
|
||||
continue;
|
||||
goto do_request;
|
||||
}
|
||||
if (!_floppy) { /* Autodetection */
|
||||
if (!probing) {
|
||||
|
@ -2929,19 +2930,18 @@ static void redo_fd_request(void)
|
|||
DPRINT("no autodetectable formats\n");
|
||||
_floppy = NULL;
|
||||
request_done(0);
|
||||
continue;
|
||||
goto do_request;
|
||||
}
|
||||
}
|
||||
probing = 1;
|
||||
_floppy =
|
||||
floppy_type + DP->autodetect[DRS->probed_format];
|
||||
_floppy = floppy_type + DP->autodetect[DRS->probed_format];
|
||||
} else
|
||||
probing = 0;
|
||||
errors = &(current_req->errors);
|
||||
tmp = make_raw_rw_request();
|
||||
if (tmp < 2) {
|
||||
request_done(tmp);
|
||||
continue;
|
||||
goto do_request;
|
||||
}
|
||||
|
||||
if (test_bit(FD_NEED_TWADDLE_BIT, &DRS->flags))
|
||||
|
@ -2949,7 +2949,6 @@ static void redo_fd_request(void)
|
|||
schedule_bh(floppy_start);
|
||||
debugt("queue fd request");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static struct cont_t rw_cont = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче