openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

floppy: cleanup: make fdc_configure() not rely on current_fdc anymore 

Now the fdc is passed in argument so that the function does not
use current_fdc anymore.

Link: https://lore.kernel.org/r/20200331094054.24441-18-w@1wt.eu
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>
This commit is contained in:
Willy Tarreau 2020-03-31 11:40:48 +02:00 committed by Denis Efremov
parent 197c7ffdb8
commit d5da6fa2b8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/block/floppy.c
View File

@ -1240,16 +1240,15 @@ static void perpendicular_mode(int fdc)
static int fifo_depth = 0xa; static int fifo_depth = 0xa;
static int no_fifo; static int no_fifo;
static int fdc_configure(void) static int fdc_configure(int fdc)
{ {
/* Turn on FIFO */ /* Turn on FIFO */
output_byte(current_fdc, FD_CONFIGURE); output_byte(fdc, FD_CONFIGURE);
if (need_more_output(current_fdc) != MORE_OUTPUT) if (need_more_output(fdc) != MORE_OUTPUT)
return 0; return 0;
output_byte(current_fdc, 0); output_byte(fdc, 0);
output_byte(current_fdc, 0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf)); output_byte(fdc, 0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf));
output_byte(current_fdc, 0); /* pre-compensation from track output_byte(fdc, 0); /* pre-compensation from track 0 upwards */
0 upwards */
return 1; return 1;
} }
@ -1288,7 +1287,7 @@ static void fdc_specify(void)
if (fdc_state[current_fdc].need_configure && if (fdc_state[current_fdc].need_configure &&
fdc_state[current_fdc].version >= FDC_82072A) { fdc_state[current_fdc].version >= FDC_82072A) {
fdc_configure(); fdc_configure(current_fdc);
fdc_state[current_fdc].need_configure = 0; fdc_state[current_fdc].need_configure = 0;
} }
@ -4318,7 +4317,7 @@ static char __init get_fdc_version(void)
return FDC_UNKNOWN; return FDC_UNKNOWN;
} }
if (!fdc_configure()) { if (!fdc_configure(current_fdc)) {
pr_info("FDC %d is an 82072\n", current_fdc); pr_info("FDC %d is an 82072\n", current_fdc);
return FDC_82072; /* 82072 doesn't know CONFIGURE */ return FDC_82072; /* 82072 doesn't know CONFIGURE */
} }