提交 2300f90e 编写于 作者: J Joe Perches 提交者: Linus Torvalds

drivers/block/floppy.c: remove LAST_OUT macro

Macros with hidden returns are not nice.
Convert the 2 uses to use direct code.
Signed-off-by: NJoe 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 d7b2b2ec
...@@ -1198,8 +1198,6 @@ static int output_byte(char byte) ...@@ -1198,8 +1198,6 @@ static int output_byte(char byte)
return -1; return -1;
} }
#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}
/* gets the response from the fdc */ /* gets the response from the fdc */
static int result(void) static int result(void)
{ {
...@@ -1679,7 +1677,10 @@ static void seek_floppy(void) ...@@ -1679,7 +1677,10 @@ static void seek_floppy(void)
do_floppy = seek_interrupt; do_floppy = seek_interrupt;
output_byte(FD_SEEK); output_byte(FD_SEEK);
output_byte(UNIT(current_drive)); output_byte(UNIT(current_drive));
LAST_OUT(track); if (output_byte(track) < 0) {
reset_fdc();
return;
}
debugt("seek command:"); debugt("seek command:");
} }
...@@ -1809,7 +1810,10 @@ static void recalibrate_floppy(void) ...@@ -1809,7 +1810,10 @@ static void recalibrate_floppy(void)
debugt("recalibrate floppy:"); debugt("recalibrate floppy:");
do_floppy = recal_interrupt; do_floppy = recal_interrupt;
output_byte(FD_RECALIBRATE); output_byte(FD_RECALIBRATE);
LAST_OUT(UNIT(current_drive)); if (output_byte(UNIT(current_drive)) < 0) {
reset_fdc();
return;
}
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册