Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/block/floppy.c: add function is_ready_state

Browse Source 
Used a couple of times, might simplify the code a bit.

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:00 -08:00 committed by Linus Torvalds
parent 29f1c7848f
commit 57584c5a38
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/block/floppy.c
View File

@ -782,6 +782,12 @@ static inline int is_selected(int dor, int unit)
return ((dor & (0x10 << unit)) && (dor & 3) == unit); return ((dor & (0x10 << unit)) && (dor & 3) == unit);
} }
static bool is_ready_state(int status)
{
int state = status & (STATUS_READY | STATUS_DIR | STATUS_DMA);
return state == STATUS_READY;
}
static int set_dor(int fdc, char mask, char data) static int set_dor(int fdc, char mask, char data)
{ {
unsigned char unit; unsigned char unit;
@ -823,8 +829,10 @@ static void twaddle(void)
DRS->select_date = jiffies; DRS->select_date = jiffies;
} }
/* reset all driver information about the current fdc. This is needed after /*
* a reset, and after a raw command. */ * Reset all driver information about the current fdc.
* This is needed after a reset, and after a raw command.
*/
static void reset_fdc_info(int mode) static void reset_fdc_info(int mode)
{ {
int drive; int drive;
@ -1162,7 +1170,8 @@ static int output_byte(char byte)
if (status < 0) if (status < 0)
return -1; return -1;
if ((status & (STATUS_READY | STATUS_DIR | STATUS_DMA)) == STATUS_READY) {
if (is_ready_state(status)) {
fd_outb(byte, FD_DATA); fd_outb(byte, FD_DATA);
#ifdef FLOPPY_SANITY_CHECK #ifdef FLOPPY_SANITY_CHECK
output_log[output_log_pos].data = byte; output_log[output_log_pos].data = byte;
@ -1221,8 +1230,10 @@ static int need_more_output(void)
if (status < 0) if (status < 0)
return -1; return -1;
if ((status & (STATUS_READY | STATUS_DIR | STATUS_DMA)) == STATUS_READY)
if (is_ready_state(status))
return MORE_OUTPUT; return MORE_OUTPUT;
return result(); return result();
} }