Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2300f90e authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7b2b2ec

drivers/block/floppy.c

+8 −4
Original line number Diff line number Diff line
@@ -1198,8 +1198,6 @@ static int output_byte(char byte) 
	return -1;

}



#define LAST_OUT(x) if (output_byte(x)<0){ reset_fdc();return;}



/* gets the response from the fdc */

static int result(void)

{
@@ -1679,7 +1677,10 @@ static void seek_floppy(void) 
	do_floppy = seek_interrupt;

	output_byte(FD_SEEK);

	output_byte(UNIT(current_drive));

	LAST_OUT(track);

	if (output_byte(track) < 0) {

		reset_fdc();

		return;

	}

	debugt("seek command:");

}
@@ -1809,7 +1810,10 @@ static void recalibrate_floppy(void) 
	debugt("recalibrate floppy:");

	do_floppy = recal_interrupt;

	output_byte(FD_RECALIBRATE);

	LAST_OUT(UNIT(current_drive));

	if (output_byte(UNIT(current_drive)) < 0) {

		reset_fdc();

		return;

	}

}



/*