summaryrefslogtreecommitdiff
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2020-03-31 12:40:46 +0300
committerDenis Efremov <efremov@linux.com>2020-05-12 19:34:54 +0300
commit3ab12a18209991fa430ea702d5d7d619bbb9ce67 (patch)
tree3ed46f0cf02e38fcdf75f05824856e491bc9588b /drivers/block/floppy.c
parent96dad77a6506ceb31eb520f97fbb5c82054f0a73 (diff)
downloadlinux-3ab12a18209991fa430ea702d5d7d619bbb9ce67.tar.xz
floppy: cleanup: make need_more_output() 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-16-w@1wt.eu Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Denis Efremov <efremov@linux.com>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 4aaf84217b53..aa2d840bf06b 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1184,9 +1184,9 @@ static int result(int fdc)
#define MORE_OUTPUT -2
/* does the fdc need more output? */
-static int need_more_output(void)
+static int need_more_output(int fdc)
{
- int status = wait_til_ready(current_fdc);
+ int status = wait_til_ready(fdc);
if (status < 0)
return -1;
@@ -1194,7 +1194,7 @@ static int need_more_output(void)
if (is_ready_state(status))
return MORE_OUTPUT;
- return result(current_fdc);
+ return result(fdc);
}
/* Set perpendicular mode as required, based on data rate, if supported.
@@ -1244,7 +1244,7 @@ static int fdc_configure(void)
{
/* Turn on FIFO */
output_byte(current_fdc, FD_CONFIGURE);
- if (need_more_output() != MORE_OUTPUT)
+ if (need_more_output(current_fdc) != MORE_OUTPUT)
return 0;
output_byte(current_fdc, 0);
output_byte(current_fdc, 0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf));
@@ -1302,7 +1302,7 @@ static void fdc_specify(void)
/* chose the default rate table, not the one
* where 1 = 2 Mbps */
output_byte(current_fdc, FD_DRIVESPEC);
- if (need_more_output() == MORE_OUTPUT) {
+ if (need_more_output(current_fdc) == MORE_OUTPUT) {
output_byte(current_fdc, UNIT(current_drive));
output_byte(current_fdc, 0xc0);
}
@@ -4324,7 +4324,7 @@ static char __init get_fdc_version(void)
}
output_byte(current_fdc, FD_PERPENDICULAR);
- if (need_more_output() == MORE_OUTPUT) {
+ if (need_more_output(current_fdc) == MORE_OUTPUT) {
output_byte(current_fdc, 0);
} else {
pr_info("FDC %d is an 82072A\n", current_fdc);